From 67584a76851010b4648b2cd7cfaffced573854d7 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 3 Jun 2020 16:52:43 -0700
Subject: [PATCH 1/5] 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 <noreply@google.com>
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
---
 README.md      |  2 +-
 synth.metadata | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c2be7723..42c9a7eb 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>5.3.0</version>
+      <version>5.5.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/synth.metadata b/synth.metadata
index bdbda382..313b92fe 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,23 +4,23 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datacatalog.git",
-        "sha": "6cd2787cb134be74c20b18503d1f85e46d5ea19b"
+        "sha": "83ec28f1d8dd12dd3ab834e8434362b79342a0c0"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "b5e9b0b09cc15c263f07da92fa64db31b2e4dd07",
-        "internalRef": "307068250"
+        "sha": "e0f9d9e1f9de890db765be46f45ca8490723e3eb",
+        "internalRef": "309824146"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "b5e9b0b09cc15c263f07da92fa64db31b2e4dd07",
-        "internalRef": "307068250"
+        "sha": "e0f9d9e1f9de890db765be46f45ca8490723e3eb",
+        "internalRef": "309824146"
       }
     },
     {

From 2c4e676dc05b81134f9bcc8f0e6ca7a06c12642a Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 3 Jun 2020 16:57:12 -0700
Subject: [PATCH 2/5] chore: enable gapicv2 for datacatalog/v1beta1 API

Committer: @miraleung
PiperOrigin-RevId: 310415142

Source-Author: Google APIs <noreply@google.com>
Source-Date: Thu May 7 12:34:02 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 684dfea7decfeca7a7526ea96a8e9256694dd5d8
Source-Link: https://github.com/googleapis/googleapis/commit/684dfea7decfeca7a7526ea96a8e9256694dd5d8
---
 .../datacatalog/v1/DataCatalogClient.java     |  139 +
 .../v1beta1/DataCatalogClient.java            | 2965 ++++++++++-------
 .../v1beta1/DataCatalogSettings.java          |  206 +-
 .../v1beta1/PolicyTagManagerClient.java       |  813 ++++-
 .../PolicyTagManagerSerializationClient.java  |   29 +-
 .../v1beta1/PolicyTagManagerSettings.java     |   18 +-
 .../datacatalog/v1beta1/package-info.java     |   16 +-
 .../v1beta1/stub/DataCatalogStub.java         |   83 +-
 .../v1beta1/stub/DataCatalogStubSettings.java |  549 +--
 .../v1beta1/stub/GrpcDataCatalogStub.java     |  535 +--
 .../stub/GrpcPolicyTagManagerStub.java        |   23 +
 .../v1beta1/stub/PolicyTagManagerStub.java    |   13 +
 .../stub/PolicyTagManagerStubSettings.java    |  148 +-
 .../datacatalog/v1/DataCatalogClientTest.java |   19 +-
 .../v1beta1/DataCatalogClientTest.java        |  976 +++---
 .../v1beta1/PolicyTagManagerClientTest.java   |  199 +-
 ...licyTagManagerSerializationClientTest.java |   28 +-
 .../datacatalog/v1/CreateTagRequest.java      |   28 +-
 .../v1/CreateTagRequestOrBuilder.java         |    8 +-
 .../cloud/datacatalog/v1/Datacatalog.java     |   56 +-
 .../google/cloud/datacatalog/v1/Entry.java    |   28 +-
 .../cloud/datacatalog/v1/EntryGroup.java      |   36 +-
 .../datacatalog/v1/EntryGroupOrBuilder.java   |    9 +-
 .../cloud/datacatalog/v1/EntryOrBuilder.java  |    8 +-
 .../v1/ListEntryGroupsRequest.java            |   72 +-
 .../v1/ListEntryGroupsRequestOrBuilder.java   |   20 +-
 .../cloud/datacatalog/v1/ListTagsRequest.java |   28 +-
 .../v1/ListTagsRequestOrBuilder.java          |    8 +-
 .../v1/RenameTagTemplateFieldRequest.java     |   21 +-
 ...enameTagTemplateFieldRequestOrBuilder.java |    6 +-
 .../datacatalog/v1/SearchCatalogRequest.java  |   49 +-
 .../v1/SearchCatalogRequestOrBuilder.java     |   14 +-
 .../cloud/datacatalog/v1/datacatalog.proto    |  107 +-
 .../datacatalog/v1beta1/Datacatalog.java      |   59 +-
 .../datacatalog/v1beta1/PolicyTagName.java    |  243 ++
 .../v1beta1/TagTemplateFieldName.java         |  243 ++
 .../datacatalog/v1beta1/TaxonomyName.java     |  211 ++
 .../datacatalog/v1beta1/datacatalog.proto     |    3 +
 synth.metadata                                |    8 +-
 39 files changed, 5495 insertions(+), 2529 deletions(-)
 create mode 100644 proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagName.java
 create mode 100644 proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateFieldName.java
 create mode 100644 proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TaxonomyName.java

diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
index 99bb906e..182cf8bb 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
@@ -25,6 +25,7 @@
 import com.google.api.gax.paging.AbstractPagedListResponse;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.api.resourcenames.ResourceName;
 import com.google.cloud.datacatalog.v1.stub.DataCatalogStub;
 import com.google.cloud.datacatalog.v1.stub.DataCatalogStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -3108,6 +3109,77 @@ public final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable()
     return stub.listTagsCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy for a resource. Replaces any existing policy. Supported
+   * resources are: - Tag templates. - Entries. - Entry groups. Note, this method cannot be used to
+   * manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform resources synced
+   * to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.setIamPolicy`
+   * to set policies on tag templates. - `datacatalog.entries.setIamPolicy` to set policies on
+   * entries. - `datacatalog.entryGroups.setIamPolicy` to set policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
+   * }
+   * </code></pre>
+   *
+   * @param resource REQUIRED: The resource for which the policy is being specified. See the
+   *     operation documentation for the appropriate value for this field.
+   * @param policy REQUIRED: The complete policy to be applied to the `resource`. The size of the
+   *     policy is limited to a few 10s of KB. An empty policy is a valid policy but certain Cloud
+   *     Platform services (such as Projects) might reject them.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy setIamPolicy(ResourceName resource, Policy policy) {
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .setPolicy(policy)
+            .build();
+    return setIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy for a resource. Replaces any existing policy. Supported
+   * resources are: - Tag templates. - Entries. - Entry groups. Note, this method cannot be used to
+   * manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform resources synced
+   * to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.setIamPolicy`
+   * to set policies on tag templates. - `datacatalog.entries.setIamPolicy` to set policies on
+   * entries. - `datacatalog.entryGroups.setIamPolicy` to set policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   Policy response = dataCatalogClient.setIamPolicy(resource.toString(), policy);
+   * }
+   * </code></pre>
+   *
+   * @param resource REQUIRED: The resource for which the policy is being specified. See the
+   *     operation documentation for the appropriate value for this field.
+   * @param policy REQUIRED: The complete policy to be applied to the `resource`. The size of the
+   *     policy is limited to a few 10s of KB. An empty policy is a valid policy but certain Cloud
+   *     Platform services (such as Projects) might reject them.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy setIamPolicy(String resource, Policy policy) {
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
+    return setIamPolicy(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Sets the access control policy for a resource. Replaces any existing policy. Supported
@@ -3171,6 +3243,73 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
     return stub.setIamPolicyCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource);
+   * }
+   * </code></pre>
+   *
+   * @param resource REQUIRED: The resource for which the policy is being requested. See the
+   *     operation documentation for the appropriate value for this field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy getIamPolicy(ResourceName resource) {
+    GetIamPolicyRequest request =
+        GetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .build();
+    return getIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource.toString());
+   * }
+   * </code></pre>
+   *
+   * @param resource REQUIRED: The resource for which the policy is being requested. See the
+   *     operation documentation for the appropriate value for this field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy getIamPolicy(String resource) {
+    GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
+    return getIamPolicy(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
index 8f382f66..5a6a1fcc 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
@@ -25,7 +25,7 @@
 import com.google.api.gax.paging.AbstractPagedListResponse;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.UnaryCallable;
-import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
 import com.google.cloud.datacatalog.v1beta1.stub.DataCatalogStub;
 import com.google.cloud.datacatalog.v1beta1.stub.DataCatalogStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -52,10 +52,8 @@
  * <pre>
  * <code>
  * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
- *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
- *   String entryGroupId = "";
- *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
- *   EntryGroup response = dataCatalogClient.createEntryGroup(formattedParent, entryGroupId, entryGroup);
+ *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+ *   dataCatalogClient.deleteEntryGroup(name);
  * }
  * </code>
  * </pre>
@@ -116,330 +114,6 @@ public class DataCatalogClient implements BackgroundResource {
   private final DataCatalogSettings settings;
   private final DataCatalogStub stub;
 
-  private static final PathTemplate ENTRY_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/entryGroups/{entry_group}/entries/{entry}");
-
-  private static final PathTemplate ENTRY_GROUP_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/entryGroups/{entry_group}");
-
-  private static final PathTemplate FIELD_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/tagTemplates/{tag_template}/fields/{field}");
-
-  private static final PathTemplate LOCATION_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}");
-
-  private static final PathTemplate TAG_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/entryGroups/{entry_group}/entries/{entry}/tags/{tag}");
-
-  private static final PathTemplate TAG_TEMPLATE_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/tagTemplates/{tag_template}");
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a entry resource.
-   *
-   * @deprecated Use the {@link EntryName} class instead.
-   */
-  @Deprecated
-  public static final String formatEntryName(
-      String project, String location, String entryGroup, String entry) {
-    return ENTRY_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location,
-        "entry_group", entryGroup,
-        "entry", entry);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a entry_group resource.
-   *
-   * @deprecated Use the {@link EntryGroupName} class instead.
-   */
-  @Deprecated
-  public static final String formatEntryGroupName(
-      String project, String location, String entryGroup) {
-    return ENTRY_GROUP_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location,
-        "entry_group", entryGroup);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a field resource.
-   *
-   * @deprecated Use the {@link FieldName} class instead.
-   */
-  @Deprecated
-  public static final String formatFieldName(
-      String project, String location, String tagTemplate, String field) {
-    return FIELD_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location,
-        "tag_template", tagTemplate,
-        "field", field);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a location resource.
-   *
-   * @deprecated Use the {@link LocationName} class instead.
-   */
-  @Deprecated
-  public static final String formatLocationName(String project, String location) {
-    return LOCATION_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String formatTagName(
-      String project, String location, String entryGroup, String entry, String tag) {
-    return TAG_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location,
-        "entry_group", entryGroup,
-        "entry", entry,
-        "tag", tag);
-  }
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a tag_template resource.
-   *
-   * @deprecated Use the {@link TagTemplateName} class instead.
-   */
-  @Deprecated
-  public static final String formatTagTemplateName(
-      String project, String location, String tagTemplate) {
-    return TAG_TEMPLATE_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "location", location,
-        "tag_template", tagTemplate);
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a entry resource.
-   *
-   * @deprecated Use the {@link EntryName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromEntryName(String entryName) {
-    return ENTRY_PATH_TEMPLATE.parse(entryName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a entry resource.
-   *
-   * @deprecated Use the {@link EntryName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromEntryName(String entryName) {
-    return ENTRY_PATH_TEMPLATE.parse(entryName).get("location");
-  }
-
-  /**
-   * Parses the entry_group from the given fully-qualified path which represents a entry resource.
-   *
-   * @deprecated Use the {@link EntryName} class instead.
-   */
-  @Deprecated
-  public static final String parseEntryGroupFromEntryName(String entryName) {
-    return ENTRY_PATH_TEMPLATE.parse(entryName).get("entry_group");
-  }
-
-  /**
-   * Parses the entry from the given fully-qualified path which represents a entry resource.
-   *
-   * @deprecated Use the {@link EntryName} class instead.
-   */
-  @Deprecated
-  public static final String parseEntryFromEntryName(String entryName) {
-    return ENTRY_PATH_TEMPLATE.parse(entryName).get("entry");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a entry_group resource.
-   *
-   * @deprecated Use the {@link EntryGroupName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromEntryGroupName(String entryGroupName) {
-    return ENTRY_GROUP_PATH_TEMPLATE.parse(entryGroupName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a entry_group
-   * resource.
-   *
-   * @deprecated Use the {@link EntryGroupName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromEntryGroupName(String entryGroupName) {
-    return ENTRY_GROUP_PATH_TEMPLATE.parse(entryGroupName).get("location");
-  }
-
-  /**
-   * Parses the entry_group from the given fully-qualified path which represents a entry_group
-   * resource.
-   *
-   * @deprecated Use the {@link EntryGroupName} class instead.
-   */
-  @Deprecated
-  public static final String parseEntryGroupFromEntryGroupName(String entryGroupName) {
-    return ENTRY_GROUP_PATH_TEMPLATE.parse(entryGroupName).get("entry_group");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a field resource.
-   *
-   * @deprecated Use the {@link FieldName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromFieldName(String fieldName) {
-    return FIELD_PATH_TEMPLATE.parse(fieldName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a field resource.
-   *
-   * @deprecated Use the {@link FieldName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromFieldName(String fieldName) {
-    return FIELD_PATH_TEMPLATE.parse(fieldName).get("location");
-  }
-
-  /**
-   * Parses the tag_template from the given fully-qualified path which represents a field resource.
-   *
-   * @deprecated Use the {@link FieldName} class instead.
-   */
-  @Deprecated
-  public static final String parseTagTemplateFromFieldName(String fieldName) {
-    return FIELD_PATH_TEMPLATE.parse(fieldName).get("tag_template");
-  }
-
-  /**
-   * Parses the field from the given fully-qualified path which represents a field resource.
-   *
-   * @deprecated Use the {@link FieldName} class instead.
-   */
-  @Deprecated
-  public static final String parseFieldFromFieldName(String fieldName) {
-    return FIELD_PATH_TEMPLATE.parse(fieldName).get("field");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a location resource.
-   *
-   * @deprecated Use the {@link LocationName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromLocationName(String locationName) {
-    return LOCATION_PATH_TEMPLATE.parse(locationName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a location resource.
-   *
-   * @deprecated Use the {@link LocationName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromLocationName(String locationName) {
-    return LOCATION_PATH_TEMPLATE.parse(locationName).get("location");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromTagName(String tagName) {
-    return TAG_PATH_TEMPLATE.parse(tagName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromTagName(String tagName) {
-    return TAG_PATH_TEMPLATE.parse(tagName).get("location");
-  }
-
-  /**
-   * Parses the entry_group from the given fully-qualified path which represents a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String parseEntryGroupFromTagName(String tagName) {
-    return TAG_PATH_TEMPLATE.parse(tagName).get("entry_group");
-  }
-
-  /**
-   * Parses the entry from the given fully-qualified path which represents a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String parseEntryFromTagName(String tagName) {
-    return TAG_PATH_TEMPLATE.parse(tagName).get("entry");
-  }
-
-  /**
-   * Parses the tag from the given fully-qualified path which represents a tag resource.
-   *
-   * @deprecated Use the {@link TagName} class instead.
-   */
-  @Deprecated
-  public static final String parseTagFromTagName(String tagName) {
-    return TAG_PATH_TEMPLATE.parse(tagName).get("tag");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a tag_template
-   * resource.
-   *
-   * @deprecated Use the {@link TagTemplateName} class instead.
-   */
-  @Deprecated
-  public static final String parseProjectFromTagTemplateName(String tagTemplateName) {
-    return TAG_TEMPLATE_PATH_TEMPLATE.parse(tagTemplateName).get("project");
-  }
-
-  /**
-   * Parses the location from the given fully-qualified path which represents a tag_template
-   * resource.
-   *
-   * @deprecated Use the {@link TagTemplateName} class instead.
-   */
-  @Deprecated
-  public static final String parseLocationFromTagTemplateName(String tagTemplateName) {
-    return TAG_TEMPLATE_PATH_TEMPLATE.parse(tagTemplateName).get("location");
-  }
-
-  /**
-   * Parses the tag_template from the given fully-qualified path which represents a tag_template
-   * resource.
-   *
-   * @deprecated Use the {@link TagTemplateName} class instead.
-   */
-  @Deprecated
-  public static final String parseTagTemplateFromTagTemplateName(String tagTemplateName) {
-    return TAG_TEMPLATE_PATH_TEMPLATE.parse(tagTemplateName).get("tag_template");
-  }
-
   /** Constructs an instance of DataCatalogClient with default settings. */
   public static final DataCatalogClient create() throws IOException {
     return create(DataCatalogSettings.newBuilder().build());
@@ -509,8 +183,7 @@ public DataCatalogStub getStub() {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   SearchCatalogRequest.Scope scope = SearchCatalogRequest.Scope.newBuilder().build();
    *   String query = "";
-   *   String orderBy = "";
-   *   for (SearchCatalogResult element : dataCatalogClient.searchCatalog(scope, query, orderBy).iterateAll()) {
+   *   for (SearchCatalogResult element : dataCatalogClient.searchCatalog(scope, query).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -526,21 +199,12 @@ public DataCatalogStub getStub() {
    *     correctly. See [Data Catalog Search
    *     Syntax](https://cloud.google.com/data-catalog/docs/how-to/search-reference) for more
    *     information.
-   * @param orderBy Specifies the ordering of results, currently supported case-sensitive choices
-   *     are:
-   *     <p>&#42; `relevance`, only supports descending &#42; `last_modified_timestamp [asc|desc]`,
-   *     defaults to descending if not specified
-   *     <p>If not specified, defaults to `relevance` descending.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final SearchCatalogPagedResponse searchCatalog(
-      SearchCatalogRequest.Scope scope, String query, String orderBy) {
+      SearchCatalogRequest.Scope scope, String query) {
     SearchCatalogRequest request =
-        SearchCatalogRequest.newBuilder()
-            .setScope(scope)
-            .setQuery(query)
-            .setOrderBy(orderBy)
-            .build();
+        SearchCatalogRequest.newBuilder().setScope(scope).setQuery(query).build();
     return searchCatalog(request);
   }
 
@@ -669,700 +333,1570 @@ public final UnaryCallable<SearchCatalogRequest, SearchCatalogResponse> searchCa
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * A maximum of 10,000 entry groups may be created per organization across all locations.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
+   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   String entryGroupId = "";
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   EntryGroup response = dataCatalogClient.createEntryGroup(formattedParent, entryGroupId, entryGroup);
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   dataCatalogClient.deleteEntryGroup(name);
    * }
    * </code></pre>
    *
-   * @param parent Required. The name of the project this entry group is in. Example:
-   *     <p>&#42; projects/{project_id}/locations/{location}
-   *     <p>Note that this EntryGroup and its child resources may not actually be stored in the
-   *     location in this name.
-   * @param entryGroupId Required. The id of the entry group to create. The id must begin with a
-   *     letter or underscore, contain only English letters, numbers and underscores, and be at most
-   *     64 characters.
-   * @param entryGroup The entry group to create. Defaults to an empty entry group.
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntryGroup createEntryGroup(
-      String parent, String entryGroupId, EntryGroup entryGroup) {
-    LOCATION_PATH_TEMPLATE.validate(parent, "createEntryGroup");
-    CreateEntryGroupRequest request =
-        CreateEntryGroupRequest.newBuilder()
-            .setParent(parent)
-            .setEntryGroupId(entryGroupId)
-            .setEntryGroup(entryGroup)
-            .build();
-    return createEntryGroup(request);
+  public final void deleteEntryGroup(EntryGroupName name) {
+    DeleteEntryGroupRequest request =
+        DeleteEntryGroupRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteEntryGroup(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * A maximum of 10,000 entry groups may be created per organization across all locations.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
+   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   String entryGroupId = "";
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   CreateEntryGroupRequest request = CreateEntryGroupRequest.newBuilder()
-   *     .setParent(formattedParent)
-   *     .setEntryGroupId(entryGroupId)
-   *     .setEntryGroup(entryGroup)
-   *     .build();
-   *   EntryGroup response = dataCatalogClient.createEntryGroup(request);
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   dataCatalogClient.deleteEntryGroup(name.toString());
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntryGroup createEntryGroup(CreateEntryGroupRequest request) {
-    return createEntryGroupCallable().call(request);
+  public final void deleteEntryGroup(String name) {
+    DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder().setName(name).build();
+    deleteEntryGroup(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * A maximum of 10,000 entry groups may be created per organization across all locations.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
+   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   String entryGroupId = "";
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   CreateEntryGroupRequest request = CreateEntryGroupRequest.newBuilder()
-   *     .setParent(formattedParent)
-   *     .setEntryGroupId(entryGroupId)
-   *     .setEntryGroup(entryGroup)
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
    *     .build();
-   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.createEntryGroupCallable().futureCall(request);
-   *   // Do something
-   *   EntryGroup response = future.get();
+   *   dataCatalogClient.deleteEntryGroup(request);
    * }
    * </code></pre>
+   *
+   * @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 UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
-    return stub.createEntryGroupCallable();
+  public final void deleteEntryGroup(DeleteEntryGroupRequest request) {
+    deleteEntryGroupCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an EntryGroup.
+   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   FieldMask readMask = FieldMask.newBuilder().build();
-   *   EntryGroup response = dataCatalogClient.getEntryGroup(formattedName, readMask);
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteEntryGroupCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
    * }
    * </code></pre>
-   *
-   * @param name Required. The name of the entry group. For example,
-   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
-   * @param readMask The fields to return. If not set or empty, all fields are returned.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntryGroup getEntryGroup(String name, FieldMask readMask) {
-    ENTRY_GROUP_PATH_TEMPLATE.validate(name, "getEntryGroup");
-    GetEntryGroupRequest request =
-        GetEntryGroupRequest.newBuilder().setName(name).setReadMask(readMask).build();
-    return getEntryGroup(request);
+  public final UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCallable() {
+    return stub.deleteEntryGroupCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an EntryGroup.
+   * Deletes an existing entry. Only entries created through
+   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
+   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
+   * [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   GetEntryGroupRequest request = GetEntryGroupRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .build();
-   *   EntryGroup response = dataCatalogClient.getEntryGroup(request);
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteEntry(name);
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param name Required. The name of the entry. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntryGroup getEntryGroup(GetEntryGroupRequest request) {
-    return getEntryGroupCallable().call(request);
+  public final void deleteEntry(EntryName name) {
+    DeleteEntryRequest request =
+        DeleteEntryRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteEntry(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an EntryGroup.
+   * Deletes an existing entry. Only entries created through
+   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
+   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
+   * [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   GetEntryGroupRequest request = GetEntryGroupRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .build();
-   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.getEntryGroupCallable().futureCall(request);
-   *   // Do something
-   *   EntryGroup response = future.get();
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteEntry(name.toString());
    * }
    * </code></pre>
+   *
+   * @param name Required. The name of the entry. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
-    return stub.getEntryGroupCallable();
+  public final void deleteEntry(String name) {
+    DeleteEntryRequest request = DeleteEntryRequest.newBuilder().setName(name).build();
+    deleteEntry(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
-   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
-   * Catalog Resource Project]
+   * Deletes an existing entry. Only entries created through
+   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
+   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
+   * [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   dataCatalogClient.deleteEntryGroup(formattedName);
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   dataCatalogClient.deleteEntry(request);
    * }
    * </code></pre>
    *
-   * @param name Required. The name of the entry group. For example,
-   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
+   * @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 void deleteEntryGroup(String name) {
-    ENTRY_GROUP_PATH_TEMPLATE.validate(name, "deleteEntryGroup");
-    DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder().setName(name).build();
-    deleteEntryGroup(request);
+  public final void deleteEntry(DeleteEntryRequest request) {
+    deleteEntryCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
-   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
-   * Catalog Resource Project]
+   * Deletes an existing entry. Only entries created through
+   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
+   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
+   * [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
-   *     .setName(formattedName)
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
+   *     .setName(name.toString())
    *     .build();
-   *   dataCatalogClient.deleteEntryGroup(request);
+   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteEntryCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
    * }
    * </code></pre>
-   *
-   * @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 void deleteEntryGroup(DeleteEntryGroupRequest request) {
-    deleteEntryGroupCallable().call(request);
+  public final UnaryCallable<DeleteEntryRequest, Empty> deleteEntryCallable() {
+    return stub.deleteEntryCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an EntryGroup. Only entry groups that do not contain entries can be deleted. Users
-   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
-   * Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Gets an entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteEntryGroupCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Entry response = dataCatalogClient.getEntry(name);
    * }
    * </code></pre>
+   *
+   * @param name Required. The name of the entry. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCallable() {
-    return stub.deleteEntryGroupCallable();
+  public final Entry getEntry(EntryName name) {
+    GetEntryRequest request =
+        GetEntryRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getEntry(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>A maximum of 100,000 entries may be created per entry group.
+   * Gets an entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   String entryId = "";
-   *   Entry entry = Entry.newBuilder().build();
-   *   Entry response = dataCatalogClient.createEntry(formattedParent, entryId, entry);
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Entry response = dataCatalogClient.getEntry(name.toString());
    * }
    * </code></pre>
    *
-   * @param parent Required. The name of the entry group this entry is in. Example:
-   *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
-   *     <p>Note that this Entry and its child resources may not actually be stored in the location
-   *     in this name.
-   * @param entryId Required. The id of the entry to create.
-   * @param entry Required. The entry to create.
+   * @param name Required. The name of the entry. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Entry createEntry(String parent, String entryId, Entry entry) {
-    ENTRY_GROUP_PATH_TEMPLATE.validate(parent, "createEntry");
-    CreateEntryRequest request =
-        CreateEntryRequest.newBuilder()
-            .setParent(parent)
-            .setEntryId(entryId)
-            .setEntry(entry)
-            .build();
-    return createEntry(request);
+  public final Entry getEntry(String name) {
+    GetEntryRequest request = GetEntryRequest.newBuilder().setName(name).build();
+    return getEntry(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>A maximum of 100,000 entries may be created per entry group.
+   * Gets an entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   String entryId = "";
-   *   Entry entry = Entry.newBuilder().build();
-   *   CreateEntryRequest request = CreateEntryRequest.newBuilder()
-   *     .setParent(formattedParent)
-   *     .setEntryId(entryId)
-   *     .setEntry(entry)
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetEntryRequest request = GetEntryRequest.newBuilder()
+   *     .setName(name.toString())
    *     .build();
-   *   Entry response = dataCatalogClient.createEntry(request);
+   *   Entry response = dataCatalogClient.getEntry(request);
    * }
    * </code></pre>
    *
    * @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 Entry createEntry(CreateEntryRequest request) {
-    return createEntryCallable().call(request);
+  public final Entry getEntry(GetEntryRequest request) {
+    return getEntryCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
-   *
-   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
-   * (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>A maximum of 100,000 entries may be created per entry group.
+   * Gets an entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   String entryId = "";
-   *   Entry entry = Entry.newBuilder().build();
-   *   CreateEntryRequest request = CreateEntryRequest.newBuilder()
-   *     .setParent(formattedParent)
-   *     .setEntryId(entryId)
-   *     .setEntry(entry)
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetEntryRequest request = GetEntryRequest.newBuilder()
+   *     .setName(name.toString())
    *     .build();
-   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.createEntryCallable().futureCall(request);
+   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.getEntryCallable().futureCall(request);
    *   // Do something
    *   Entry response = future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
-    return stub.createEntryCallable();
+  public final UnaryCallable<GetEntryRequest, Entry> getEntryCallable() {
+    return stub.getEntryCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
-   * by the `entry.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Get an entry by target resource name. This method allows clients to use the resource name from
+   * the source Google Cloud Platform service to get the Data Catalog Entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   Entry entry = Entry.newBuilder().build();
-   *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   Entry response = dataCatalogClient.updateEntry(entry, updateMask);
+   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+   *   Entry response = dataCatalogClient.lookupEntry(request);
    * }
    * </code></pre>
    *
-   * @param entry Required. The updated entry. The "name" field must be set.
-   * @param updateMask The fields to update on the entry. If absent or empty, all modifiable fields
-   *     are updated.
-   *     <p>The following fields are modifiable: &#42; For entries with type `DATA_STREAM`: &#42;
-   *     `schema` &#42; For entries with type `FILESET` &#42; `schema` &#42; `display_name` &#42;
-   *     `description` &#42; `gcs_fileset_spec` &#42; `gcs_fileset_spec.file_patterns` &#42; For
-   *     entries with `user_specified_type` &#42; `schema` &#42; `display_name` &#42; `description`
-   *     &#42; user_specified_type &#42; user_specified_system &#42; linked_resource &#42;
-   *     source_system_timestamps
+   * @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 Entry updateEntry(Entry entry, FieldMask updateMask) {
-    UpdateEntryRequest request =
-        UpdateEntryRequest.newBuilder().setEntry(entry).setUpdateMask(updateMask).build();
-    return updateEntry(request);
+  public final Entry lookupEntry(LookupEntryRequest request) {
+    return lookupEntryCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
-   * by the `entry.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Get an entry by target resource name. This method allows clients to use the resource name from
+   * the source Google Cloud Platform service to get the Data Catalog Entry.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   Entry entry = Entry.newBuilder().build();
-   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
-   *     .setEntry(entry)
-   *     .build();
-   *   Entry response = dataCatalogClient.updateEntry(request);
+   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.lookupEntryCallable().futureCall(request);
+   *   // Do something
+   *   Entry response = future.get();
    * }
    * </code></pre>
-   *
-   * @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 Entry updateEntry(UpdateEntryRequest request) {
-    return updateEntryCallable().call(request);
+  public final UnaryCallable<LookupEntryRequest, Entry> lookupEntryCallable() {
+    return stub.lookupEntryCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
-   * by the `entry.name` parameter (see [Data Catalog Resource Project]
+   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
+   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   Entry entry = Entry.newBuilder().build();
-   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
-   *     .setEntry(entry)
-   *     .build();
-   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.updateEntryCallable().futureCall(request);
-   *   // Do something
-   *   Entry response = future.get();
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplate(name, force);
    * }
    * </code></pre>
+   *
+   * @param name Required. The name of the tag template to delete. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}
+   * @param force Required. Currently, this field must always be set to `true`. This confirms the
+   *     deletion of any possible tags using this template. `force = false` will be supported in the
+   *     future.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
-    return stub.updateEntryCallable();
+  public final void deleteTagTemplate(TagTemplateName name, boolean force) {
+    DeleteTagTemplateRequest request =
+        DeleteTagTemplateRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setForce(force)
+            .build();
+    deleteTagTemplate(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an existing entry. Only entries created through
-   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
-   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
-   * [Data Catalog Resource Project]
+   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
+   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   dataCatalogClient.deleteEntry(formattedName);
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplate(name.toString(), force);
    * }
    * </code></pre>
    *
-   * @param name Required. The name of the entry. Example:
-   *     <p>&#42;
-   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   * @param name Required. The name of the tag template to delete. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}
+   * @param force Required. Currently, this field must always be set to `true`. This confirms the
+   *     deletion of any possible tags using this template. `force = false` will be supported in the
+   *     future.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final void deleteEntry(String name) {
-    ENTRY_PATH_TEMPLATE.validate(name, "deleteEntry");
-    DeleteEntryRequest request = DeleteEntryRequest.newBuilder().setName(name).build();
-    deleteEntry(request);
+  public final void deleteTagTemplate(String name, boolean force) {
+    DeleteTagTemplateRequest request =
+        DeleteTagTemplateRequest.newBuilder().setName(name).setForce(force).build();
+    deleteTagTemplate(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an existing entry. Only entries created through
-   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
-   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
-   * [Data Catalog Resource Project]
+   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
+   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
-   *     .setName(formattedName)
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
    *     .build();
-   *   dataCatalogClient.deleteEntry(request);
+   *   dataCatalogClient.deleteTagTemplate(request);
    * }
    * </code></pre>
    *
    * @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 void deleteEntry(DeleteEntryRequest request) {
-    deleteEntryCallable().call(request);
+  public final void deleteTagTemplate(DeleteTagTemplateRequest request) {
+    deleteTagTemplateCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes an existing entry. Only entries created through
-   * [CreateEntry][google.cloud.datacatalog.v1beta1.DataCatalog.CreateEntry] method can be deleted.
-   * Users should enable the Data Catalog API in the project identified by the `name` parameter (see
-   * [Data Catalog Resource Project]
+   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
+   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
    * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
-   *     .setName(formattedName)
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
    *     .build();
-   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteEntryCallable().futureCall(request);
+   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagTemplateCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<DeleteEntryRequest, Empty> deleteEntryCallable() {
-    return stub.deleteEntryCallable();
+  public final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
+    return stub.deleteTagTemplateCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an entry.
+   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
+   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
+   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   Entry response = dataCatalogClient.getEntry(formattedName);
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplateField(name, force);
    * }
    * </code></pre>
    *
-   * @param name Required. The name of the entry. Example:
+   * @param name Required. The name of the tag template field to delete. Example:
    *     <p>&#42;
-   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param force Required. Currently, this field must always be set to `true`. This confirms the
+   *     deletion of this field from any tags using this field. `force = false` will be supported in
+   *     the future.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Entry getEntry(String name) {
-    ENTRY_PATH_TEMPLATE.validate(name, "getEntry");
-    GetEntryRequest request = GetEntryRequest.newBuilder().setName(name).build();
-    return getEntry(request);
+  public final void deleteTagTemplateField(TagTemplateFieldName name, boolean force) {
+    DeleteTagTemplateFieldRequest request =
+        DeleteTagTemplateFieldRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setForce(force)
+            .build();
+    deleteTagTemplateField(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an entry.
+   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
+   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
+   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   GetEntryRequest request = GetEntryRequest.newBuilder()
-   *     .setName(formattedName)
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplateField(name.toString(), force);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template field to delete. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param force Required. Currently, this field must always be set to `true`. This confirms the
+   *     deletion of this field from any tags using this field. `force = false` will be supported in
+   *     the future.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTagTemplateField(String name, boolean force) {
+    DeleteTagTemplateFieldRequest request =
+        DeleteTagTemplateFieldRequest.newBuilder().setName(name).setForce(force).build();
+    deleteTagTemplateField(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
+   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
+   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   DeleteTagTemplateFieldRequest request = DeleteTagTemplateFieldRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
    *     .build();
-   *   Entry response = dataCatalogClient.getEntry(request);
+   *   dataCatalogClient.deleteTagTemplateField(request);
    * }
    * </code></pre>
    *
    * @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 Entry getEntry(GetEntryRequest request) {
-    return getEntryCallable().call(request);
+  public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request) {
+    deleteTagTemplateFieldCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets an entry.
+   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
+   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
+   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   GetEntryRequest request = GetEntryRequest.newBuilder()
-   *     .setName(formattedName)
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   DeleteTagTemplateFieldRequest request = DeleteTagTemplateFieldRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
    *     .build();
-   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.getEntryCallable().futureCall(request);
+   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagTemplateFieldCallable().futureCall(request);
    *   // Do something
-   *   Entry response = future.get();
+   *   future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<GetEntryRequest, Entry> getEntryCallable() {
-    return stub.getEntryCallable();
+  public final UnaryCallable<DeleteTagTemplateFieldRequest, Empty>
+      deleteTagTemplateFieldCallable() {
+    return stub.deleteTagTemplateFieldCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Get an entry by target resource name. This method allows clients to use the resource name from
-   * the source Google Cloud Platform service to get the Data Catalog Entry.
+   * Deletes a tag.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
-   *   Entry response = dataCatalogClient.lookupEntry(request);
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteTag(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag to delete. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}/tags/{tag_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTag(EntryName name) {
+    DeleteTagRequest request =
+        DeleteTagRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a tag.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteTag(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag to delete. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}/tags/{tag_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTag(String name) {
+    DeleteTagRequest request = DeleteTagRequest.newBuilder().setName(name).build();
+    deleteTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a tag.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   dataCatalogClient.deleteTag(request);
    * }
    * </code></pre>
    *
    * @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 Entry lookupEntry(LookupEntryRequest request) {
-    return lookupEntryCallable().call(request);
+  public final void deleteTag(DeleteTagRequest request) {
+    deleteTagCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Get an entry by target resource name. This method allows clients to use the resource name from
-   * the source Google Cloud Platform service to get the Data Catalog Entry.
+   * Deletes a tag.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
-   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.lookupEntryCallable().futureCall(request);
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagCallable().futureCall(request);
    *   // Do something
-   *   Entry response = future.get();
+   *   future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<LookupEntryRequest, Entry> lookupEntryCallable() {
-    return stub.lookupEntryCallable();
+  public final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
+    return stub.deleteTagCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Lists entry groups.
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   ListEntryGroupsResponse response = dataCatalogClient.listEntryGroups(formattedParent);
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource);
    * }
    * </code></pre>
    *
-   * @param parent Required. The name of the location that contains the entry groups, which can be
-   *     provided in URL format. Example:
-   *     <p>&#42; projects/{project_id}/locations/{location}
+   * @param resource REQUIRED: The resource for which the policy is being requested. See the
+   *     operation documentation for the appropriate value for this field.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntryGroupsResponse listEntryGroups(String parent) {
-    LOCATION_PATH_TEMPLATE.validate(parent, "listEntryGroups");
-    ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder().setParent(parent).build();
-    return listEntryGroups(request);
+  public final Policy getIamPolicy(ResourceName resource) {
+    GetIamPolicyRequest request =
+        GetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .build();
+    return getIamPolicy(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Lists entry groups.
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource.toString());
+   * }
+   * </code></pre>
+   *
+   * @param resource REQUIRED: The resource for which the policy is being requested. See the
+   *     operation documentation for the appropriate value for this field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy getIamPolicy(String resource) {
+    GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
+    return getIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
    *     .build();
-   *   ListEntryGroupsResponse response = dataCatalogClient.listEntryGroups(request);
+   *   Policy response = dataCatalogClient.getIamPolicy(request);
    * }
    * </code></pre>
    *
    * @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 ListEntryGroupsResponse listEntryGroups(ListEntryGroupsRequest request) {
-    return listEntryGroupsCallable().call(request);
+  public final Policy getIamPolicy(GetIamPolicyRequest request) {
+    return getIamPolicyCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Lists entry groups.
+   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
+   * does not exist. An empty policy is returned if the resource exists but does not have a policy
+   * set on it.
+   *
+   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
+   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
+   * resources synced to Data Catalog.
+   *
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
+   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
+   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
+   *   ApiFuture&lt;Policy&gt; future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
+   *   // Do something
+   *   Policy response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
+    return stub.getIamPolicyCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * A maximum of 10,000 entry groups may be created per organization across all locations.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String entryGroupId = "";
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.createEntryGroup(parent, entryGroupId, entryGroup);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the project this entry group is in. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}
+   *     <p>Note that this EntryGroup and its child resources may not actually be stored in the
+   *     location in this name.
+   * @param entryGroupId Required. The id of the entry group to create. The id must begin with a
+   *     letter or underscore, contain only English letters, numbers and underscores, and be at most
+   *     64 characters.
+   * @param entryGroup The entry group to create. Defaults to an empty entry group.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup createEntryGroup(
+      LocationName parent, String entryGroupId, EntryGroup entryGroup) {
+    CreateEntryGroupRequest request =
+        CreateEntryGroupRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setEntryGroupId(entryGroupId)
+            .setEntryGroup(entryGroup)
+            .build();
+    return createEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * A maximum of 10,000 entry groups may be created per organization across all locations.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String entryGroupId = "";
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.createEntryGroup(parent.toString(), entryGroupId, entryGroup);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the project this entry group is in. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}
+   *     <p>Note that this EntryGroup and its child resources may not actually be stored in the
+   *     location in this name.
+   * @param entryGroupId Required. The id of the entry group to create. The id must begin with a
+   *     letter or underscore, contain only English letters, numbers and underscores, and be at most
+   *     64 characters.
+   * @param entryGroup The entry group to create. Defaults to an empty entry group.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup createEntryGroup(
+      String parent, String entryGroupId, EntryGroup entryGroup) {
+    CreateEntryGroupRequest request =
+        CreateEntryGroupRequest.newBuilder()
+            .setParent(parent)
+            .setEntryGroupId(entryGroupId)
+            .setEntryGroup(entryGroup)
+            .build();
+    return createEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * A maximum of 10,000 entry groups may be created per organization across all locations.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String entryGroupId = "";
+   *   CreateEntryGroupRequest request = CreateEntryGroupRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setEntryGroupId(entryGroupId)
+   *     .build();
+   *   EntryGroup response = dataCatalogClient.createEntryGroup(request);
+   * }
+   * </code></pre>
+   *
+   * @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 EntryGroup createEntryGroup(CreateEntryGroupRequest request) {
+    return createEntryGroupCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * A maximum of 10,000 entry groups may be created per organization across all locations.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String entryGroupId = "";
+   *   CreateEntryGroupRequest request = CreateEntryGroupRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setEntryGroupId(entryGroupId)
+   *     .build();
+   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.createEntryGroupCallable().futureCall(request);
+   *   // Do something
+   *   EntryGroup response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
+    return stub.createEntryGroupCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
+   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.updateEntryGroup(entryGroup);
+   * }
+   * </code></pre>
+   *
+   * @param entryGroup Required. The updated entry group. "name" field must be set.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup updateEntryGroup(EntryGroup entryGroup) {
+    UpdateEntryGroupRequest request =
+        UpdateEntryGroupRequest.newBuilder().setEntryGroup(entryGroup).build();
+    return updateEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
+   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.updateEntryGroup(entryGroup, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param entryGroup Required. The updated entry group. "name" field must be set.
+   * @param updateMask The fields to update on the entry group. If absent or empty, all modifiable
+   *     fields are updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup updateEntryGroup(EntryGroup entryGroup, FieldMask updateMask) {
+    UpdateEntryGroupRequest request =
+        UpdateEntryGroupRequest.newBuilder()
+            .setEntryGroup(entryGroup)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
+   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   UpdateEntryGroupRequest request = UpdateEntryGroupRequest.newBuilder()
+   *     .setEntryGroup(entryGroup)
+   *     .build();
+   *   EntryGroup response = dataCatalogClient.updateEntryGroup(request);
+   * }
+   * </code></pre>
+   *
+   * @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 EntryGroup updateEntryGroup(UpdateEntryGroupRequest request) {
+    return updateEntryGroupCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
+   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
+   *   UpdateEntryGroupRequest request = UpdateEntryGroupRequest.newBuilder()
+   *     .setEntryGroup(entryGroup)
+   *     .build();
+   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.updateEntryGroupCallable().futureCall(request);
+   *   // Do something
+   *   EntryGroup response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable() {
+    return stub.updateEntryGroupCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   EntryGroup response = dataCatalogClient.getEntryGroup(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup getEntryGroup(EntryGroupName name) {
+    GetEntryGroupRequest request =
+        GetEntryGroupRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   EntryGroup response = dataCatalogClient.getEntryGroup(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup getEntryGroup(String name) {
+    GetEntryGroupRequest request = GetEntryGroupRequest.newBuilder().setName(name).build();
+    return getEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   FieldMask readMask = FieldMask.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.getEntryGroup(name, readMask);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
+   * @param readMask The fields to return. If not set or empty, all fields are returned.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup getEntryGroup(EntryGroupName name, FieldMask readMask) {
+    GetEntryGroupRequest request =
+        GetEntryGroupRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setReadMask(readMask)
+            .build();
+    return getEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   FieldMask readMask = FieldMask.newBuilder().build();
+   *   EntryGroup response = dataCatalogClient.getEntryGroup(name.toString(), readMask);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the entry group. For example,
+   *     `projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}`.
+   * @param readMask The fields to return. If not set or empty, all fields are returned.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntryGroup getEntryGroup(String name, FieldMask readMask) {
+    GetEntryGroupRequest request =
+        GetEntryGroupRequest.newBuilder().setName(name).setReadMask(readMask).build();
+    return getEntryGroup(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   GetEntryGroupRequest request = GetEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   EntryGroup response = dataCatalogClient.getEntryGroup(request);
+   * }
+   * </code></pre>
+   *
+   * @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 EntryGroup getEntryGroup(GetEntryGroupRequest request) {
+    return getEntryGroupCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets an EntryGroup.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   GetEntryGroupRequest request = GetEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.getEntryGroupCallable().futureCall(request);
+   *   // Do something
+   *   EntryGroup response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
+    return stub.getEntryGroupCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   for (EntryGroup element : dataCatalogClient.listEntryGroups(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the location that contains the entry groups, which can be
+   *     provided in URL format. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListEntryGroupsPagedResponse listEntryGroups(EntryGroupName parent) {
+    ListEntryGroupsRequest request =
+        ListEntryGroupsRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return listEntryGroups(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   for (EntryGroup element : dataCatalogClient.listEntryGroups(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the location that contains the entry groups, which can be
+   *     provided in URL format. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListEntryGroupsPagedResponse listEntryGroups(String parent) {
+    ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder().setParent(parent).build();
+    return listEntryGroups(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (EntryGroup element : dataCatalogClient.listEntryGroups(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @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 ListEntryGroupsPagedResponse listEntryGroups(ListEntryGroupsRequest request) {
+    return listEntryGroupsPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;ListEntryGroupsPagedResponse&gt; future = dataCatalogClient.listEntryGroupsPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (EntryGroup element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsPagedResponse>
+      listEntryGroupsPagedCallable() {
+    return stub.listEntryGroupsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists entry groups.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListEntryGroupsResponse response = dataCatalogClient.listEntryGroupsCallable().call(request);
+   *     for (EntryGroup element : response.getEntryGroupsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse>
+      listEntryGroupsCallable() {
+    return stub.listEntryGroupsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>A maximum of 100,000 entries may be created per entry group.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   String entryId = "";
+   *   Entry entry = Entry.newBuilder().build();
+   *   Entry response = dataCatalogClient.createEntry(parent, entryId, entry);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the entry group this entry is in. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
+   *     <p>Note that this Entry and its child resources may not actually be stored in the location
+   *     in this name.
+   * @param entryId Required. The id of the entry to create.
+   * @param entry Required. The entry to create.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Entry createEntry(EntryGroupName parent, String entryId, Entry entry) {
+    CreateEntryRequest request =
+        CreateEntryRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setEntryId(entryId)
+            .setEntry(entry)
+            .build();
+    return createEntry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>A maximum of 100,000 entries may be created per entry group.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   String entryId = "";
+   *   Entry entry = Entry.newBuilder().build();
+   *   Entry response = dataCatalogClient.createEntry(parent.toString(), entryId, entry);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The name of the entry group this entry is in. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
+   *     <p>Note that this Entry and its child resources may not actually be stored in the location
+   *     in this name.
+   * @param entryId Required. The id of the entry to create.
+   * @param entry Required. The entry to create.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Entry createEntry(String parent, String entryId, Entry entry) {
+    CreateEntryRequest request =
+        CreateEntryRequest.newBuilder()
+            .setParent(parent)
+            .setEntryId(entryId)
+            .setEntry(entry)
+            .build();
+    return createEntry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>A maximum of 100,000 entries may be created per entry group.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   String entryId = "";
+   *   Entry entry = Entry.newBuilder().build();
+   *   CreateEntryRequest request = CreateEntryRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setEntryId(entryId)
+   *     .setEntry(entry)
+   *     .build();
+   *   Entry response = dataCatalogClient.createEntry(request);
+   * }
+   * </code></pre>
+   *
+   * @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 Entry createEntry(CreateEntryRequest request) {
+    return createEntryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates an entry. Only entries of 'FILESET' type or user-specified type can be created.
+   *
+   * <p>Users should enable the Data Catalog API in the project identified by the `parent` parameter
+   * (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>A maximum of 100,000 entries may be created per entry group.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   String entryId = "";
+   *   Entry entry = Entry.newBuilder().build();
+   *   CreateEntryRequest request = CreateEntryRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setEntryId(entryId)
+   *     .setEntry(entry)
+   *     .build();
+   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.createEntryCallable().futureCall(request);
+   *   // Do something
+   *   Entry response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
+    return stub.createEntryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
+   * by the `entry.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   Entry entry = Entry.newBuilder().build();
+   *   Entry response = dataCatalogClient.updateEntry(entry);
+   * }
+   * </code></pre>
+   *
+   * @param entry Required. The updated entry. The "name" field must be set.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Entry updateEntry(Entry entry) {
+    UpdateEntryRequest request = UpdateEntryRequest.newBuilder().setEntry(entry).build();
+    return updateEntry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
+   * by the `entry.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   Entry entry = Entry.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Entry response = dataCatalogClient.updateEntry(entry, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param entry Required. The updated entry. The "name" field must be set.
+   * @param updateMask The fields to update on the entry. If absent or empty, all modifiable fields
+   *     are updated.
+   *     <p>The following fields are modifiable: &#42; For entries with type `DATA_STREAM`: &#42;
+   *     `schema` &#42; For entries with type `FILESET` &#42; `schema` &#42; `display_name` &#42;
+   *     `description` &#42; `gcs_fileset_spec` &#42; `gcs_fileset_spec.file_patterns` &#42; For
+   *     entries with `user_specified_type` &#42; `schema` &#42; `display_name` &#42; `description`
+   *     &#42; user_specified_type &#42; user_specified_system &#42; linked_resource &#42;
+   *     source_system_timestamps
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Entry updateEntry(Entry entry, FieldMask updateMask) {
+    UpdateEntryRequest request =
+        UpdateEntryRequest.newBuilder().setEntry(entry).setUpdateMask(updateMask).build();
+    return updateEntry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
+   * by the `entry.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   Entry entry = Entry.newBuilder().build();
+   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
+   *     .setEntry(entry)
+   *     .build();
+   *   Entry response = dataCatalogClient.updateEntry(request);
+   * }
+   * </code></pre>
+   *
+   * @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 Entry updateEntry(UpdateEntryRequest request) {
+    return updateEntryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates an existing entry. Users should enable the Data Catalog API in the project identified
+   * by the `entry.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-   *   ListEntryGroupsRequest request = ListEntryGroupsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *   Entry entry = Entry.newBuilder().build();
+   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
+   *     .setEntry(entry)
    *     .build();
-   *   ApiFuture&lt;ListEntryGroupsResponse&gt; future = dataCatalogClient.listEntryGroupsCallable().futureCall(request);
+   *   ApiFuture&lt;Entry&gt; future = dataCatalogClient.updateEntryCallable().futureCall(request);
    *   // Do something
-   *   ListEntryGroupsResponse response = future.get();
+   *   Entry response = future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse>
-      listEntryGroupsCallable() {
-    return stub.listEntryGroupsCallable();
+  public final UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
+    return stub.updateEntryCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -1373,8 +1907,10 @@ public final ListEntryGroupsResponse listEntryGroups(ListEntryGroupsRequest requ
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   ListEntriesResponse response = dataCatalogClient.listEntries(formattedParent);
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   for (Entry element : dataCatalogClient.listEntries(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
@@ -1383,9 +1919,11 @@ public final ListEntryGroupsResponse listEntryGroups(ListEntryGroupsRequest requ
    *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntriesResponse listEntries(String parent) {
-    ENTRY_GROUP_PATH_TEMPLATE.validate(parent, "listEntries");
-    ListEntriesRequest request = ListEntriesRequest.newBuilder().setParent(parent).build();
+  public final ListEntriesPagedResponse listEntries(EntryGroupName parent) {
+    ListEntriesRequest request =
+        ListEntriesRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
     return listEntries(request);
   }
 
@@ -1397,19 +1935,21 @@ public final ListEntriesResponse listEntries(String parent) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   ListEntriesRequest request = ListEntriesRequest.newBuilder()
-   *     .setParent(formattedParent)
-   *     .build();
-   *   ListEntriesResponse response = dataCatalogClient.listEntries(request);
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   for (Entry element : dataCatalogClient.listEntries(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param parent Required. The name of the entry group that contains the entries, which can be
+   *     provided in URL format. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntriesResponse listEntries(ListEntriesRequest request) {
-    return listEntriesCallable().call(request);
+  public final ListEntriesPagedResponse listEntries(String parent) {
+    ListEntriesRequest request = ListEntriesRequest.newBuilder().setParent(parent).build();
+    return listEntries(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -1420,121 +1960,114 @@ public final ListEntriesResponse listEntries(ListEntriesRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
    *   ListEntriesRequest request = ListEntriesRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture&lt;ListEntriesResponse&gt; future = dataCatalogClient.listEntriesCallable().futureCall(request);
-   *   // Do something
-   *   ListEntriesResponse response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
-    return stub.listEntriesCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
-   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   EntryGroup response = dataCatalogClient.updateEntryGroup(entryGroup);
+   *   for (Entry element : dataCatalogClient.listEntries(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
-   * @param entryGroup Required. The updated entry group. "name" field must be set.
+   * @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 EntryGroup updateEntryGroup(EntryGroup entryGroup) {
-    UpdateEntryGroupRequest request =
-        UpdateEntryGroupRequest.newBuilder().setEntryGroup(entryGroup).build();
-    return updateEntryGroup(request);
+  public final ListEntriesPagedResponse listEntries(ListEntriesRequest request) {
+    return listEntriesPagedCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
-   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Lists entries.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   EntryGroup response = dataCatalogClient.updateEntryGroup(entryGroup, updateMask);
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   ListEntriesRequest request = ListEntriesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;ListEntriesPagedResponse&gt; future = dataCatalogClient.listEntriesPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (Entry element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
-   *
-   * @param entryGroup Required. The updated entry group. "name" field must be set.
-   * @param updateMask The fields to update on the entry group. If absent or empty, all modifiable
-   *     fields are updated.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntryGroup updateEntryGroup(EntryGroup entryGroup, FieldMask updateMask) {
-    UpdateEntryGroupRequest request =
-        UpdateEntryGroupRequest.newBuilder()
-            .setEntryGroup(entryGroup)
-            .setUpdateMask(updateMask)
-            .build();
-    return updateEntryGroup(request);
+  public final UnaryCallable<ListEntriesRequest, ListEntriesPagedResponse>
+      listEntriesPagedCallable() {
+    return stub.listEntriesPagedCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
-   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Lists entries.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   UpdateEntryGroupRequest request = UpdateEntryGroupRequest.newBuilder()
-   *     .setEntryGroup(entryGroup)
+   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   ListEntriesRequest request = ListEntriesRequest.newBuilder()
+   *     .setParent(parent.toString())
    *     .build();
-   *   EntryGroup response = dataCatalogClient.updateEntryGroup(request);
+   *   while (true) {
+   *     ListEntriesResponse response = dataCatalogClient.listEntriesCallable().call(request);
+   *     for (Entry element : response.getEntriesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
    * }
    * </code></pre>
-   *
-   * @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 EntryGroup updateEntryGroup(UpdateEntryGroupRequest request) {
-    return updateEntryGroupCallable().call(request);
+  public final UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
+    return stub.listEntriesCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Updates an EntryGroup. The user should enable the Data Catalog API in the project identified by
-   * the `entry_group.name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Creates a tag template. The user should enable the Data Catalog API in the project identified
+   * by the `parent` parameter (see [Data Catalog Resource
+   * Project](https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
-   *   UpdateEntryGroupRequest request = UpdateEntryGroupRequest.newBuilder()
-   *     .setEntryGroup(entryGroup)
-   *     .build();
-   *   ApiFuture&lt;EntryGroup&gt; future = dataCatalogClient.updateEntryGroupCallable().futureCall(request);
-   *   // Do something
-   *   EntryGroup response = future.get();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String tagTemplateId = "";
+   *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
+   *   TagTemplate response = dataCatalogClient.createTagTemplate(parent, tagTemplateId, tagTemplate);
    * }
    * </code></pre>
+   *
+   * @param parent Required. The name of the project and the template location
+   *     [region](https://cloud.google.com/data-catalog/docs/concepts/regions.
+   *     <p>Example:
+   *     <p>&#42; projects/{project_id}/locations/us-central1
+   * @param tagTemplateId Required. The id of the tag template to create.
+   * @param tagTemplate Required. The tag template to create.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable() {
-    return stub.updateEntryGroupCallable();
+  public final TagTemplate createTagTemplate(
+      LocationName parent, String tagTemplateId, TagTemplate tagTemplate) {
+    CreateTagTemplateRequest request =
+        CreateTagTemplateRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setTagTemplateId(tagTemplateId)
+            .setTagTemplate(tagTemplate)
+            .build();
+    return createTagTemplate(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -1548,10 +2081,10 @@ public final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroup
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   String tagTemplateId = "";
    *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
-   *   TagTemplate response = dataCatalogClient.createTagTemplate(formattedParent, tagTemplateId, tagTemplate);
+   *   TagTemplate response = dataCatalogClient.createTagTemplate(parent.toString(), tagTemplateId, tagTemplate);
    * }
    * </code></pre>
    *
@@ -1565,7 +2098,6 @@ public final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroup
    */
   public final TagTemplate createTagTemplate(
       String parent, String tagTemplateId, TagTemplate tagTemplate) {
-    LOCATION_PATH_TEMPLATE.validate(parent, "createTagTemplate");
     CreateTagTemplateRequest request =
         CreateTagTemplateRequest.newBuilder()
             .setParent(parent)
@@ -1586,11 +2118,11 @@ public final TagTemplate createTagTemplate(
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   String tagTemplateId = "";
    *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
    *   CreateTagTemplateRequest request = CreateTagTemplateRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTagTemplateId(tagTemplateId)
    *     .setTagTemplate(tagTemplate)
    *     .build();
@@ -1616,11 +2148,11 @@ public final TagTemplate createTagTemplate(CreateTagTemplateRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   String tagTemplateId = "";
    *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
    *   CreateTagTemplateRequest request = CreateTagTemplateRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTagTemplateId(tagTemplateId)
    *     .setTagTemplate(tagTemplate)
    *     .build();
@@ -1642,8 +2174,31 @@ public final UnaryCallable<CreateTagTemplateRequest, TagTemplate> createTagTempl
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   TagTemplate response = dataCatalogClient.getTagTemplate(formattedName);
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplate response = dataCatalogClient.getTagTemplate(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template. Example:
+   *     <p>&#42; projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplate getTagTemplate(TagTemplateName name) {
+    GetTagTemplateRequest request =
+        GetTagTemplateRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getTagTemplate(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a tag template.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplate response = dataCatalogClient.getTagTemplate(name.toString());
    * }
    * </code></pre>
    *
@@ -1652,7 +2207,6 @@ public final UnaryCallable<CreateTagTemplateRequest, TagTemplate> createTagTempl
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final TagTemplate getTagTemplate(String name) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(name, "getTagTemplate");
     GetTagTemplateRequest request = GetTagTemplateRequest.newBuilder().setName(name).build();
     return getTagTemplate(request);
   }
@@ -1665,9 +2219,9 @@ public final TagTemplate getTagTemplate(String name) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
    *   GetTagTemplateRequest request = GetTagTemplateRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .build();
    *   TagTemplate response = dataCatalogClient.getTagTemplate(request);
    * }
@@ -1688,9 +2242,9 @@ public final TagTemplate getTagTemplate(GetTagTemplateRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
    *   GetTagTemplateRequest request = GetTagTemplateRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .build();
    *   ApiFuture&lt;TagTemplate&gt; future = dataCatalogClient.getTagTemplateCallable().futureCall(request);
    *   // Do something
@@ -1702,6 +2256,32 @@ public final UnaryCallable<GetTagTemplateRequest, TagTemplate> getTagTemplateCal
     return stub.getTagTemplateCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a tag template. This method cannot be used to update the fields of a template. The tag
+   * template fields are represented as separate resources and should be updated using their own
+   * create/update/delete methods. Users should enable the Data Catalog API in the project
+   * identified by the `tag_template.name` parameter (see [Data Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
+   *   TagTemplate response = dataCatalogClient.updateTagTemplate(tagTemplate);
+   * }
+   * </code></pre>
+   *
+   * @param tagTemplate Required. The template to update. The "name" field must be set.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplate updateTagTemplate(TagTemplate tagTemplate) {
+    UpdateTagTemplateRequest request =
+        UpdateTagTemplateRequest.newBuilder().setTagTemplate(tagTemplate).build();
+    return updateTagTemplate(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates a tag template. This method cannot be used to update the fields of a template. The tag
@@ -1791,85 +2371,42 @@ public final UnaryCallable<UpdateTagTemplateRequest, TagTemplate> updateTagTempl
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
-   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplate(formattedName, force);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The name of the tag template to delete. Example:
-   *     <p>&#42; projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}
-   * @param force Required. Currently, this field must always be set to `true`. This confirms the
-   *     deletion of any possible tags using this template. `force = false` will be supported in the
-   *     future.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTagTemplate(String name, boolean force) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(name, "deleteTagTemplate");
-    DeleteTagTemplateRequest request =
-        DeleteTagTemplateRequest.newBuilder().setName(name).setForce(force).build();
-    deleteTagTemplate(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
-   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   * Creates a field in a tag template. The user should enable the Data Catalog API in the project
+   * identified by the `parent` parameter (see [Data Catalog Resource
+   * Project](https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .setForce(force)
-   *     .build();
-   *   dataCatalogClient.deleteTagTemplate(request);
+   *   TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   String tagTemplateFieldId = "";
+   *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+   *   TagTemplateField response = dataCatalogClient.createTagTemplateField(parent, tagTemplateFieldId, tagTemplateField);
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param parent Required. The name of the project and the template location
+   *     [region](https://cloud.google.com/data-catalog/docs/concepts/regions).
+   *     <p>Example:
+   *     <p>&#42; projects/{project_id}/locations/us-central1/tagTemplates/{tag_template_id}
+   * @param tagTemplateFieldId Required. The ID of the tag template field to create. Field ids can
+   *     contain letters (both uppercase and lowercase), numbers (0-9), underscores (_) and dashes
+   *     (-). Field IDs must be at least 1 character long and at most 128 characters long. Field IDs
+   *     must also be unique within their template.
+   * @param tagTemplateField Required. The tag template field to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTagTemplate(DeleteTagTemplateRequest request) {
-    deleteTagTemplateCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a tag template and all tags using the template. Users should enable the Data Catalog
-   * API in the project identified by the `name` parameter (see [Data Catalog Resource Project]
-   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .setForce(force)
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagTemplateCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
-    return stub.deleteTagTemplateCallable();
+   */
+  public final TagTemplateField createTagTemplateField(
+      TagTemplateName parent, String tagTemplateFieldId, TagTemplateField tagTemplateField) {
+    CreateTagTemplateFieldRequest request =
+        CreateTagTemplateFieldRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setTagTemplateFieldId(tagTemplateFieldId)
+            .setTagTemplateField(tagTemplateField)
+            .build();
+    return createTagTemplateField(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -1883,10 +2420,10 @@ public final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCal
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
    *   String tagTemplateFieldId = "";
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
-   *   TagTemplateField response = dataCatalogClient.createTagTemplateField(formattedParent, tagTemplateFieldId, tagTemplateField);
+   *   TagTemplateField response = dataCatalogClient.createTagTemplateField(parent.toString(), tagTemplateFieldId, tagTemplateField);
    * }
    * </code></pre>
    *
@@ -1903,7 +2440,6 @@ public final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCal
    */
   public final TagTemplateField createTagTemplateField(
       String parent, String tagTemplateFieldId, TagTemplateField tagTemplateField) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(parent, "createTagTemplateField");
     CreateTagTemplateFieldRequest request =
         CreateTagTemplateFieldRequest.newBuilder()
             .setParent(parent)
@@ -1924,11 +2460,11 @@ public final TagTemplateField createTagTemplateField(
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
    *   String tagTemplateFieldId = "";
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
    *   CreateTagTemplateFieldRequest request = CreateTagTemplateFieldRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTagTemplateFieldId(tagTemplateFieldId)
    *     .setTagTemplateField(tagTemplateField)
    *     .build();
@@ -1954,11 +2490,11 @@ public final TagTemplateField createTagTemplateField(CreateTagTemplateFieldReque
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
    *   String tagTemplateFieldId = "";
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
    *   CreateTagTemplateFieldRequest request = CreateTagTemplateFieldRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTagTemplateFieldId(tagTemplateFieldId)
    *     .setTagTemplateField(tagTemplateField)
    *     .build();
@@ -1984,10 +2520,118 @@ public final TagTemplateField createTagTemplateField(CreateTagTemplateFieldReque
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+   *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(name, tagTemplateField);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template field. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param tagTemplateField Required. The template to update.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplateField updateTagTemplateField(
+      TagTemplateFieldName name, TagTemplateField tagTemplateField) {
+    UpdateTagTemplateFieldRequest request =
+        UpdateTagTemplateFieldRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setTagTemplateField(tagTemplateField)
+            .build();
+    return updateTagTemplateField(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a field in a tag template. This method cannot be used to update the field type. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+   *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(name.toString(), tagTemplateField);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template field. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param tagTemplateField Required. The template to update.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplateField updateTagTemplateField(
+      String name, TagTemplateField tagTemplateField) {
+    UpdateTagTemplateFieldRequest request =
+        UpdateTagTemplateFieldRequest.newBuilder()
+            .setName(name)
+            .setTagTemplateField(tagTemplateField)
+            .build();
+    return updateTagTemplateField(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a field in a tag template. This method cannot be used to update the field type. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(name, tagTemplateField, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template field. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param tagTemplateField Required. The template to update.
+   * @param updateMask Optional. The field mask specifies the parts of the template to be updated.
+   *     Allowed fields:
+   *     <p>&#42; `display_name` &#42; `type.enum_type` &#42; `is_required`
+   *     <p>If `update_mask` is not set or empty, all of the allowed fields above will be updated.
+   *     <p>When updating an enum type, the provided values will be merged with the existing values.
+   *     Therefore, enum values can only be added, existing enum values cannot be deleted nor
+   *     renamed. Updating a template field from optional to required is NOT allowed.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplateField updateTagTemplateField(
+      TagTemplateFieldName name, TagTemplateField tagTemplateField, FieldMask updateMask) {
+    UpdateTagTemplateFieldRequest request =
+        UpdateTagTemplateFieldRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setTagTemplateField(tagTemplateField)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateTagTemplateField(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a field in a tag template. This method cannot be used to update the field type. Users
+   * should enable the Data Catalog API in the project identified by the `name` parameter (see [Data
+   * Catalog Resource Project]
+   * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(formattedName, tagTemplateField, updateMask);
+   *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(name.toString(), tagTemplateField, updateMask);
    * }
    * </code></pre>
    *
@@ -2006,7 +2650,6 @@ public final TagTemplateField createTagTemplateField(CreateTagTemplateFieldReque
    */
   public final TagTemplateField updateTagTemplateField(
       String name, TagTemplateField tagTemplateField, FieldMask updateMask) {
-    FIELD_PATH_TEMPLATE.validate(name, "updateTagTemplateField");
     UpdateTagTemplateFieldRequest request =
         UpdateTagTemplateFieldRequest.newBuilder()
             .setName(name)
@@ -2027,10 +2670,10 @@ public final TagTemplateField updateTagTemplateField(
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
    *   UpdateTagTemplateFieldRequest request = UpdateTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .setTagTemplateField(tagTemplateField)
    *     .build();
    *   TagTemplateField response = dataCatalogClient.updateTagTemplateField(request);
@@ -2055,10 +2698,10 @@ public final TagTemplateField updateTagTemplateField(UpdateTagTemplateFieldReque
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
    *   UpdateTagTemplateFieldRequest request = UpdateTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .setTagTemplateField(tagTemplateField)
    *     .build();
    *   ApiFuture&lt;TagTemplateField&gt; future = dataCatalogClient.updateTagTemplateFieldCallable().futureCall(request);
@@ -2083,9 +2726,43 @@ public final TagTemplateField updateTagTemplateField(UpdateTagTemplateFieldReque
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   String newTagTemplateFieldId = "";
+   *   TagTemplateField response = dataCatalogClient.renameTagTemplateField(name, newTagTemplateFieldId);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The name of the tag template. Example:
+   *     <p>&#42;
+   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
+   * @param newTagTemplateFieldId Required. The new ID of this tag template field. For example,
+   *     `my_new_field`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TagTemplateField renameTagTemplateField(
+      TagTemplateFieldName name, String newTagTemplateFieldId) {
+    RenameTagTemplateFieldRequest request =
+        RenameTagTemplateFieldRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setNewTagTemplateFieldId(newTagTemplateFieldId)
+            .build();
+    return renameTagTemplateField(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Renames a field in a tag template. The user should enable the Data Catalog API in the project
+   * identified by the `name` parameter (see [Data Catalog Resource
+   * Project](https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
+   * information).
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   String newTagTemplateFieldId = "";
-   *   TagTemplateField response = dataCatalogClient.renameTagTemplateField(formattedName, newTagTemplateFieldId);
+   *   TagTemplateField response = dataCatalogClient.renameTagTemplateField(name.toString(), newTagTemplateFieldId);
    * }
    * </code></pre>
    *
@@ -2097,7 +2774,6 @@ public final TagTemplateField updateTagTemplateField(UpdateTagTemplateFieldReque
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final TagTemplateField renameTagTemplateField(String name, String newTagTemplateFieldId) {
-    FIELD_PATH_TEMPLATE.validate(name, "renameTagTemplateField");
     RenameTagTemplateFieldRequest request =
         RenameTagTemplateFieldRequest.newBuilder()
             .setName(name)
@@ -2117,10 +2793,10 @@ public final TagTemplateField renameTagTemplateField(String name, String newTagT
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   String newTagTemplateFieldId = "";
    *   RenameTagTemplateFieldRequest request = RenameTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .setNewTagTemplateFieldId(newTagTemplateFieldId)
    *     .build();
    *   TagTemplateField response = dataCatalogClient.renameTagTemplateField(request);
@@ -2145,10 +2821,10 @@ public final TagTemplateField renameTagTemplateField(RenameTagTemplateFieldReque
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
    *   String newTagTemplateFieldId = "";
    *   RenameTagTemplateFieldRequest request = RenameTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
+   *     .setName(name.toString())
    *     .setNewTagTemplateFieldId(newTagTemplateFieldId)
    *     .build();
    *   ApiFuture&lt;TagTemplateField&gt; future = dataCatalogClient.renameTagTemplateFieldCallable().futureCall(request);
@@ -2164,90 +2840,39 @@ public final TagTemplateField renameTagTemplateField(RenameTagTemplateFieldReque
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
-   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
-   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
-   * information).
+   * Creates a tag on an [Entry][google.cloud.datacatalog.v1beta1.Entry]. Note: The project
+   * identified by the `parent` parameter for the
+   * [tag](https://cloud.google.com/data-catalog/docs/reference/rest/v1beta1/projects.locations.entryGroups.entries.tags/create#path-parameters)
+   * and the [tag
+   * template](https://cloud.google.com/data-catalog/docs/reference/rest/v1beta1/projects.locations.tagTemplates/create#path-parameters)
+   * used to create the tag must be from the same organization.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplateField(formattedName, force);
+   *   TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
+   *   Tag tag = Tag.newBuilder().build();
+   *   Tag response = dataCatalogClient.createTag(parent, tag);
    * }
    * </code></pre>
    *
-   * @param name Required. The name of the tag template field to delete. Example:
+   * @param parent Required. The name of the resource to attach this tag to. Tags can be attached to
+   *     Entries. Example:
    *     <p>&#42;
-   *     projects/{project_id}/locations/{location}/tagTemplates/{tag_template_id}/fields/{tag_template_field_id}
-   * @param force Required. Currently, this field must always be set to `true`. This confirms the
-   *     deletion of this field from any tags using this field. `force = false` will be supported in
-   *     the future.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTagTemplateField(String name, boolean force) {
-    FIELD_PATH_TEMPLATE.validate(name, "deleteTagTemplateField");
-    DeleteTagTemplateFieldRequest request =
-        DeleteTagTemplateFieldRequest.newBuilder().setName(name).setForce(force).build();
-    deleteTagTemplateField(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
-   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
-   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
-   * information).
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   boolean force = false;
-   *   DeleteTagTemplateFieldRequest request = DeleteTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .setForce(force)
-   *     .build();
-   *   dataCatalogClient.deleteTagTemplateField(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   *     <p>Note that this Tag and its child resources may not actually be stored in the location in
+   *     this name.
+   * @param tag Required. The tag to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request) {
-    deleteTagTemplateFieldCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a field in a tag template and all uses of that field. Users should enable the Data
-   * Catalog API in the project identified by the `name` parameter (see [Data Catalog Resource
-   * Project] (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more
-   * information).
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   boolean force = false;
-   *   DeleteTagTemplateFieldRequest request = DeleteTagTemplateFieldRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .setForce(force)
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagTemplateFieldCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteTagTemplateFieldRequest, Empty>
-      deleteTagTemplateFieldCallable() {
-    return stub.deleteTagTemplateFieldCallable();
+  public final Tag createTag(TagName parent, Tag tag) {
+    CreateTagRequest request =
+        CreateTagRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setTag(tag)
+            .build();
+    return createTag(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -2263,9 +2888,9 @@ public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request)
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
    *   Tag tag = Tag.newBuilder().build();
-   *   Tag response = dataCatalogClient.createTag(formattedParent, tag);
+   *   Tag response = dataCatalogClient.createTag(parent.toString(), tag);
    * }
    * </code></pre>
    *
@@ -2279,7 +2904,6 @@ public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request)
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final Tag createTag(String parent, Tag tag) {
-    ENTRY_PATH_TEMPLATE.validate(parent, "createTag");
     CreateTagRequest request = CreateTagRequest.newBuilder().setParent(parent).setTag(tag).build();
     return createTag(request);
   }
@@ -2297,10 +2921,10 @@ public final Tag createTag(String parent, Tag tag) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
    *   Tag tag = Tag.newBuilder().build();
    *   CreateTagRequest request = CreateTagRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTag(tag)
    *     .build();
    *   Tag response = dataCatalogClient.createTag(request);
@@ -2327,10 +2951,10 @@ public final Tag createTag(CreateTagRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
    *   Tag tag = Tag.newBuilder().build();
    *   CreateTagRequest request = CreateTagRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .setTag(tag)
    *     .build();
    *   ApiFuture&lt;Tag&gt; future = dataCatalogClient.createTagCallable().futureCall(request);
@@ -2352,19 +2976,15 @@ public final UnaryCallable<CreateTagRequest, Tag> createTagCallable() {
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   Tag tag = Tag.newBuilder().build();
-   *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   Tag response = dataCatalogClient.updateTag(tag, updateMask);
+   *   Tag response = dataCatalogClient.updateTag(tag);
    * }
    * </code></pre>
    *
    * @param tag Required. The updated tag. The "name" field must be set.
-   * @param updateMask The fields to update on the Tag. If absent or empty, all modifiable fields
-   *     are updated. Currently the only modifiable field is the field `fields`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Tag updateTag(Tag tag, FieldMask updateMask) {
-    UpdateTagRequest request =
-        UpdateTagRequest.newBuilder().setTag(tag).setUpdateMask(updateMask).build();
+  public final Tag updateTag(Tag tag) {
+    UpdateTagRequest request = UpdateTagRequest.newBuilder().setTag(tag).build();
     return updateTag(request);
   }
 
@@ -2377,18 +2997,20 @@ public final Tag updateTag(Tag tag, FieldMask updateMask) {
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   Tag tag = Tag.newBuilder().build();
-   *   UpdateTagRequest request = UpdateTagRequest.newBuilder()
-   *     .setTag(tag)
-   *     .build();
-   *   Tag response = dataCatalogClient.updateTag(request);
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Tag response = dataCatalogClient.updateTag(tag, updateMask);
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param tag Required. The updated tag. The "name" field must be set.
+   * @param updateMask The fields to update on the Tag. If absent or empty, all modifiable fields
+   *     are updated. Currently the only modifiable field is the field `fields`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Tag updateTag(UpdateTagRequest request) {
-    return updateTagCallable().call(request);
+  public final Tag updateTag(Tag tag, FieldMask updateMask) {
+    UpdateTagRequest request =
+        UpdateTagRequest.newBuilder().setTag(tag).setUpdateMask(updateMask).build();
+    return updateTag(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -2403,83 +3025,66 @@ public final Tag updateTag(UpdateTagRequest request) {
    *   UpdateTagRequest request = UpdateTagRequest.newBuilder()
    *     .setTag(tag)
    *     .build();
-   *   ApiFuture&lt;Tag&gt; future = dataCatalogClient.updateTagCallable().futureCall(request);
-   *   // Do something
-   *   Tag response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<UpdateTagRequest, Tag> updateTagCallable() {
-    return stub.updateTagCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes a tag.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
-   *   dataCatalogClient.deleteTag(formattedName);
+   *   Tag response = dataCatalogClient.updateTag(request);
    * }
    * </code></pre>
    *
-   * @param name Required. The name of the tag to delete. Example:
-   *     <p>&#42;
-   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}/tags/{tag_id}
+   * @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 void deleteTag(String name) {
-    TAG_PATH_TEMPLATE.validate(name, "deleteTag");
-    DeleteTagRequest request = DeleteTagRequest.newBuilder().setName(name).build();
-    deleteTag(request);
+  public final Tag updateTag(UpdateTagRequest request) {
+    return updateTagCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes a tag.
+   * Updates an existing tag.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
-   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
-   *     .setName(formattedName)
+   *   Tag tag = Tag.newBuilder().build();
+   *   UpdateTagRequest request = UpdateTagRequest.newBuilder()
+   *     .setTag(tag)
    *     .build();
-   *   dataCatalogClient.deleteTag(request);
+   *   ApiFuture&lt;Tag&gt; future = dataCatalogClient.updateTagCallable().futureCall(request);
+   *   // Do something
+   *   Tag response = future.get();
    * }
    * </code></pre>
-   *
-   * @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 void deleteTag(DeleteTagRequest request) {
-    deleteTagCallable().call(request);
+  public final UnaryCallable<UpdateTagRequest, Tag> updateTagCallable() {
+    return stub.updateTagCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Deletes a tag.
+   * Lists the tags on an [Entry][google.cloud.datacatalog.v1beta1.Entry].
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedName = DataCatalogClient.formatTagName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
-   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
-   *     .setName(formattedName)
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = dataCatalogClient.deleteTagCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   for (Tag element : dataCatalogClient.listTags(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
+   *
+   * @param parent Required. The name of the Data Catalog resource to list the tags of. The resource
+   *     could be an [Entry][google.cloud.datacatalog.v1beta1.Entry] or an
+   *     [EntryGroup][google.cloud.datacatalog.v1beta1.EntryGroup].
+   *     <p>Examples:
+   *     <p>&#42; projects/{project_id}/locations/{location}/entryGroups/{entry_group_id} &#42;
+   *     projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
-    return stub.deleteTagCallable();
+  public final ListTagsPagedResponse listTags(EntryName parent) {
+    ListTagsRequest request =
+        ListTagsRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
+    return listTags(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -2490,8 +3095,8 @@ public final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   for (Tag element : dataCatalogClient.listTags(formattedParent).iterateAll()) {
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   for (Tag element : dataCatalogClient.listTags(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -2506,7 +3111,6 @@ public final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListTagsPagedResponse listTags(String parent) {
-    ENTRY_PATH_TEMPLATE.validate(parent, "listTags");
     ListTagsRequest request = ListTagsRequest.newBuilder().setParent(parent).build();
     return listTags(request);
   }
@@ -2519,9 +3123,9 @@ public final ListTagsPagedResponse listTags(String parent) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   ListTagsRequest request = ListTagsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .build();
    *   for (Tag element : dataCatalogClient.listTags(request).iterateAll()) {
    *     // doThingsWith(element);
@@ -2544,9 +3148,9 @@ public final ListTagsPagedResponse listTags(ListTagsRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   ListTagsRequest request = ListTagsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .build();
    *   ApiFuture&lt;ListTagsPagedResponse&gt; future = dataCatalogClient.listTagsPagedCallable().futureCall(request);
    *   // Do something
@@ -2568,9 +3172,9 @@ public final UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPaged
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedParent = DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   ListTagsRequest request = ListTagsRequest.newBuilder()
-   *     .setParent(formattedParent)
+   *     .setParent(parent.toString())
    *     .build();
    *   while (true) {
    *     ListTagsResponse response = dataCatalogClient.listTagsCallable().call(request);
@@ -2606,9 +3210,9 @@ public final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable()
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy policy = Policy.newBuilder().build();
-   *   Policy response = dataCatalogClient.setIamPolicy(formattedResource, policy);
+   *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
    * }
    * </code></pre>
    *
@@ -2619,10 +3223,12 @@ public final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable()
    *     Platform services (such as Projects) might reject them.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Policy setIamPolicy(String resource, Policy policy) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(resource, "setIamPolicy");
+  public final Policy setIamPolicy(ResourceName resource, Policy policy) {
     SetIamPolicyRequest request =
-        SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
+        SetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .setPolicy(policy)
+            .build();
     return setIamPolicy(request);
   }
 
@@ -2641,21 +3247,23 @@ public final Policy setIamPolicy(String resource, Policy policy) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy policy = Policy.newBuilder().build();
-   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
-   *     .setResource(formattedResource)
-   *     .setPolicy(policy)
-   *     .build();
-   *   Policy response = dataCatalogClient.setIamPolicy(request);
+   *   Policy response = dataCatalogClient.setIamPolicy(resource.toString(), policy);
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param resource REQUIRED: The resource for which the policy is being specified. See the
+   *     operation documentation for the appropriate value for this field.
+   * @param policy REQUIRED: The complete policy to be applied to the `resource`. The size of the
+   *     policy is limited to a few 10s of KB. An empty policy is a valid policy but certain Cloud
+   *     Platform services (such as Projects) might reject them.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Policy setIamPolicy(SetIamPolicyRequest request) {
-    return setIamPolicyCallable().call(request);
+  public final Policy setIamPolicy(String resource, Policy policy) {
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
+    return setIamPolicy(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -2673,157 +3281,52 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy policy = Policy.newBuilder().build();
    *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
-   *     .setResource(formattedResource)
+   *     .setResource(resource.toString())
    *     .setPolicy(policy)
    *     .build();
-   *   ApiFuture&lt;Policy&gt; future = dataCatalogClient.setIamPolicyCallable().futureCall(request);
-   *   // Do something
-   *   Policy response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
-    return stub.setIamPolicyCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
-   * does not exist. An empty policy is returned if the resource exists but does not have a policy
-   * set on it.
-   *
-   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
-   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
-   * resources synced to Data Catalog.
-   *
-   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
-   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
-   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   Policy response = dataCatalogClient.getIamPolicy(formattedResource);
-   * }
-   * </code></pre>
-   *
-   * @param resource REQUIRED: The resource for which the policy is being requested. See the
-   *     operation documentation for the appropriate value for this field.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Policy getIamPolicy(String resource) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(resource, "getIamPolicy");
-    GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
-    return getIamPolicy(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
-   * does not exist. An empty policy is returned if the resource exists but does not have a policy
-   * set on it.
-   *
-   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
-   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
-   * resources synced to Data Catalog.
-   *
-   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
-   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
-   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
-   *     .setResource(formattedResource)
-   *     .build();
-   *   Policy response = dataCatalogClient.getIamPolicy(request);
+   *   Policy response = dataCatalogClient.setIamPolicy(request);
    * }
    * </code></pre>
    *
    * @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 Policy getIamPolicy(GetIamPolicyRequest request) {
-    return getIamPolicyCallable().call(request);
+  public final Policy setIamPolicy(SetIamPolicyRequest request) {
+    return setIamPolicyCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets the access control policy for a resource. A `NOT_FOUND` error is returned if the resource
-   * does not exist. An empty policy is returned if the resource exists but does not have a policy
-   * set on it.
-   *
-   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
-   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
-   * resources synced to Data Catalog.
+   * Sets the access control policy for a resource. Replaces any existing policy. Supported
+   * resources are: - Tag templates. - Entries. - Entry groups. Note, this method cannot be used to
+   * manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform resources synced
+   * to Data Catalog.
    *
-   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.getIamPolicy`
-   * to get policies on tag templates. - `datacatalog.entries.getIamPolicy` to get policies on
-   * entries. - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
+   * <p>Callers must have following Google IAM permission - `datacatalog.tagTemplates.setIamPolicy`
+   * to set policies on tag templates. - `datacatalog.entries.setIamPolicy` to set policies on
+   * entries. - `datacatalog.entryGroups.setIamPolicy` to set policies on entry groups.
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
-   *     .setResource(formattedResource)
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .setPolicy(policy)
    *     .build();
-   *   ApiFuture&lt;Policy&gt; future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
+   *   ApiFuture&lt;Policy&gt; future = dataCatalogClient.setIamPolicyCallable().futureCall(request);
    *   // Do something
    *   Policy response = future.get();
    * }
    * </code></pre>
    */
-  public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
-    return stub.getIamPolicyCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns the caller's permissions on a resource. If the resource does not exist, an empty set of
-   * permissions is returned (We don't return a `NOT_FOUND` error).
-   *
-   * <p>Supported resources are: - Tag templates. - Entries. - Entry groups. Note, this method
-   * cannot be used to manage policies for BigQuery, Pub/Sub and any external Google Cloud Platform
-   * resources synced to Data Catalog.
-   *
-   * <p>A caller is not required to have Google IAM permission to make this request.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
-   *   TestIamPermissionsResponse response = dataCatalogClient.testIamPermissions(formattedResource, permissions);
-   * }
-   * </code></pre>
-   *
-   * @param resource REQUIRED: The resource for which the policy detail is being requested. See the
-   *     operation documentation for the appropriate value for this field.
-   * @param permissions The set of permissions to check for the `resource`. Permissions with
-   *     wildcards (such as '&#42;' or 'storage.&#42;') are not allowed. For more information see
-   *     [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final TestIamPermissionsResponse testIamPermissions(
-      String resource, List<String> permissions) {
-    TAG_TEMPLATE_PATH_TEMPLATE.validate(resource, "testIamPermissions");
-    TestIamPermissionsRequest request =
-        TestIamPermissionsRequest.newBuilder()
-            .setResource(resource)
-            .addAllPermissions(permissions)
-            .build();
-    return testIamPermissions(request);
+  public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
+    return stub.setIamPolicyCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -2841,10 +3344,10 @@ public final TestIamPermissionsResponse testIamPermissions(
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
    *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
-   *     .setResource(formattedResource)
+   *     .setResource(resource.toString())
    *     .addAllPermissions(permissions)
    *     .build();
    *   TestIamPermissionsResponse response = dataCatalogClient.testIamPermissions(request);
@@ -2873,10 +3376,10 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    *
    * <pre><code>
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String formattedResource = DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
    *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
-   *     .setResource(formattedResource)
+   *     .setResource(resource.toString())
    *     .addAllPermissions(permissions)
    *     .build();
    *   ApiFuture&lt;TestIamPermissionsResponse&gt; future = dataCatalogClient.testIamPermissionsCallable().futureCall(request);
@@ -3001,6 +3504,168 @@ protected SearchCatalogFixedSizeCollection createCollection(
     }
   }
 
+  public static class ListEntryGroupsPagedResponse
+      extends AbstractPagedListResponse<
+          ListEntryGroupsRequest,
+          ListEntryGroupsResponse,
+          EntryGroup,
+          ListEntryGroupsPage,
+          ListEntryGroupsFixedSizeCollection> {
+
+    public static ApiFuture<ListEntryGroupsPagedResponse> createAsync(
+        PageContext<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup> context,
+        ApiFuture<ListEntryGroupsResponse> futureResponse) {
+      ApiFuture<ListEntryGroupsPage> futurePage =
+          ListEntryGroupsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<ListEntryGroupsPage, ListEntryGroupsPagedResponse>() {
+            @Override
+            public ListEntryGroupsPagedResponse apply(ListEntryGroupsPage input) {
+              return new ListEntryGroupsPagedResponse(input);
+            }
+          },
+          MoreExecutors.directExecutor());
+    }
+
+    private ListEntryGroupsPagedResponse(ListEntryGroupsPage page) {
+      super(page, ListEntryGroupsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListEntryGroupsPage
+      extends AbstractPage<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup, ListEntryGroupsPage> {
+
+    private ListEntryGroupsPage(
+        PageContext<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup> context,
+        ListEntryGroupsResponse response) {
+      super(context, response);
+    }
+
+    private static ListEntryGroupsPage createEmptyPage() {
+      return new ListEntryGroupsPage(null, null);
+    }
+
+    @Override
+    protected ListEntryGroupsPage createPage(
+        PageContext<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup> context,
+        ListEntryGroupsResponse response) {
+      return new ListEntryGroupsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture<ListEntryGroupsPage> createPageAsync(
+        PageContext<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup> context,
+        ApiFuture<ListEntryGroupsResponse> futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListEntryGroupsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListEntryGroupsRequest,
+          ListEntryGroupsResponse,
+          EntryGroup,
+          ListEntryGroupsPage,
+          ListEntryGroupsFixedSizeCollection> {
+
+    private ListEntryGroupsFixedSizeCollection(
+        List<ListEntryGroupsPage> pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListEntryGroupsFixedSizeCollection createEmptyCollection() {
+      return new ListEntryGroupsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListEntryGroupsFixedSizeCollection createCollection(
+        List<ListEntryGroupsPage> pages, int collectionSize) {
+      return new ListEntryGroupsFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListEntriesPagedResponse
+      extends AbstractPagedListResponse<
+          ListEntriesRequest,
+          ListEntriesResponse,
+          Entry,
+          ListEntriesPage,
+          ListEntriesFixedSizeCollection> {
+
+    public static ApiFuture<ListEntriesPagedResponse> createAsync(
+        PageContext<ListEntriesRequest, ListEntriesResponse, Entry> context,
+        ApiFuture<ListEntriesResponse> futureResponse) {
+      ApiFuture<ListEntriesPage> futurePage =
+          ListEntriesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<ListEntriesPage, ListEntriesPagedResponse>() {
+            @Override
+            public ListEntriesPagedResponse apply(ListEntriesPage input) {
+              return new ListEntriesPagedResponse(input);
+            }
+          },
+          MoreExecutors.directExecutor());
+    }
+
+    private ListEntriesPagedResponse(ListEntriesPage page) {
+      super(page, ListEntriesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListEntriesPage
+      extends AbstractPage<ListEntriesRequest, ListEntriesResponse, Entry, ListEntriesPage> {
+
+    private ListEntriesPage(
+        PageContext<ListEntriesRequest, ListEntriesResponse, Entry> context,
+        ListEntriesResponse response) {
+      super(context, response);
+    }
+
+    private static ListEntriesPage createEmptyPage() {
+      return new ListEntriesPage(null, null);
+    }
+
+    @Override
+    protected ListEntriesPage createPage(
+        PageContext<ListEntriesRequest, ListEntriesResponse, Entry> context,
+        ListEntriesResponse response) {
+      return new ListEntriesPage(context, response);
+    }
+
+    @Override
+    public ApiFuture<ListEntriesPage> createPageAsync(
+        PageContext<ListEntriesRequest, ListEntriesResponse, Entry> context,
+        ApiFuture<ListEntriesResponse> futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListEntriesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListEntriesRequest,
+          ListEntriesResponse,
+          Entry,
+          ListEntriesPage,
+          ListEntriesFixedSizeCollection> {
+
+    private ListEntriesFixedSizeCollection(List<ListEntriesPage> pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListEntriesFixedSizeCollection createEmptyCollection() {
+      return new ListEntriesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListEntriesFixedSizeCollection createCollection(
+        List<ListEntriesPage> pages, int collectionSize) {
+      return new ListEntriesFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
   public static class ListTagsPagedResponse
       extends AbstractPagedListResponse<
           ListTagsRequest, ListTagsResponse, Tag, ListTagsPage, ListTagsFixedSizeCollection> {
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogSettings.java
index a2f17fb5..96be6c13 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogSettings.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.datacatalog.v1beta1;
 
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntriesPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntryGroupsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListTagsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.SearchCatalogPagedResponse;
 
@@ -55,16 +57,16 @@
  * <p>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.
  *
- * <p>For example, to set the total timeout of createEntryGroup to 30 seconds:
+ * <p>For example, to set the total timeout of deleteEntryGroup to 30 seconds:
  *
  * <pre>
  * <code>
  * DataCatalogSettings.Builder dataCatalogSettingsBuilder =
  *     DataCatalogSettings.newBuilder();
  * dataCatalogSettingsBuilder
- *     .createEntryGroupSettings()
+ *     .deleteEntryGroupSettings()
  *     .setRetrySettings(
- *         dataCatalogSettingsBuilder.createEntryGroupSettings().getRetrySettings().toBuilder()
+ *         dataCatalogSettingsBuilder.deleteEntryGroupSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DataCatalogSettings dataCatalogSettings = dataCatalogSettingsBuilder.build();
@@ -80,31 +82,11 @@ public class DataCatalogSettings extends ClientSettings<DataCatalogSettings> {
     return ((DataCatalogStubSettings) getStubSettings()).searchCatalogSettings();
   }
 
-  /** Returns the object with the settings used for calls to createEntryGroup. */
-  public UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).createEntryGroupSettings();
-  }
-
-  /** Returns the object with the settings used for calls to getEntryGroup. */
-  public UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).getEntryGroupSettings();
-  }
-
   /** Returns the object with the settings used for calls to deleteEntryGroup. */
   public UnaryCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).deleteEntryGroupSettings();
   }
 
-  /** Returns the object with the settings used for calls to createEntry. */
-  public UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).createEntrySettings();
-  }
-
-  /** Returns the object with the settings used for calls to updateEntry. */
-  public UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).updateEntrySettings();
-  }
-
   /** Returns the object with the settings used for calls to deleteEntry. */
   public UnaryCallSettings<DeleteEntryRequest, Empty> deleteEntrySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).deleteEntrySettings();
@@ -120,15 +102,29 @@ public UnaryCallSettings<LookupEntryRequest, Entry> lookupEntrySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).lookupEntrySettings();
   }
 
-  /** Returns the object with the settings used for calls to listEntryGroups. */
-  public UnaryCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
-      listEntryGroupsSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).listEntryGroupsSettings();
+  /** Returns the object with the settings used for calls to deleteTagTemplate. */
+  public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateSettings();
   }
 
-  /** Returns the object with the settings used for calls to listEntries. */
-  public UnaryCallSettings<ListEntriesRequest, ListEntriesResponse> listEntriesSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).listEntriesSettings();
+  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
+  public UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateFieldSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteTag. */
+  public UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).getIamPolicySettings();
+  }
+
+  /** Returns the object with the settings used for calls to createEntryGroup. */
+  public UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).createEntryGroupSettings();
   }
 
   /** Returns the object with the settings used for calls to updateEntryGroup. */
@@ -136,6 +132,34 @@ public UnaryCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupSe
     return ((DataCatalogStubSettings) getStubSettings()).updateEntryGroupSettings();
   }
 
+  /** Returns the object with the settings used for calls to getEntryGroup. */
+  public UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).getEntryGroupSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listEntryGroups. */
+  public PagedCallSettings<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+      listEntryGroupsSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).listEntryGroupsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to createEntry. */
+  public UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).createEntrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to updateEntry. */
+  public UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).updateEntrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to listEntries. */
+  public PagedCallSettings<ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+      listEntriesSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).listEntriesSettings();
+  }
+
   /** Returns the object with the settings used for calls to createTagTemplate. */
   public UnaryCallSettings<CreateTagTemplateRequest, TagTemplate> createTagTemplateSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).createTagTemplateSettings();
@@ -151,11 +175,6 @@ public UnaryCallSettings<UpdateTagTemplateRequest, TagTemplate> updateTagTemplat
     return ((DataCatalogStubSettings) getStubSettings()).updateTagTemplateSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplate. */
-  public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateSettings();
-  }
-
   /** Returns the object with the settings used for calls to createTagTemplateField. */
   public UnaryCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldSettings() {
@@ -174,11 +193,6 @@ public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSetti
     return ((DataCatalogStubSettings) getStubSettings()).renameTagTemplateFieldSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
-  public UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateFieldSettings();
-  }
-
   /** Returns the object with the settings used for calls to createTag. */
   public UnaryCallSettings<CreateTagRequest, Tag> createTagSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).createTagSettings();
@@ -189,11 +203,6 @@ public UnaryCallSettings<UpdateTagRequest, Tag> updateTagSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).updateTagSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteTag. */
-  public UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagSettings();
-  }
-
   /** Returns the object with the settings used for calls to listTags. */
   public PagedCallSettings<ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
       listTagsSettings() {
@@ -205,11 +214,6 @@ public UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).setIamPolicySettings();
   }
 
-  /** Returns the object with the settings used for calls to getIamPolicy. */
-  public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).getIamPolicySettings();
-  }
-
   /** Returns the object with the settings used for calls to testIamPermissions. */
   public UnaryCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsSettings() {
@@ -319,32 +323,11 @@ public Builder applyToAllUnaryMethods(
       return getStubSettingsBuilder().searchCatalogSettings();
     }
 
-    /** Returns the builder for the settings used for calls to createEntryGroup. */
-    public UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
-        createEntryGroupSettings() {
-      return getStubSettingsBuilder().createEntryGroupSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to getEntryGroup. */
-    public UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
-      return getStubSettingsBuilder().getEntryGroupSettings();
-    }
-
     /** Returns the builder for the settings used for calls to deleteEntryGroup. */
     public UnaryCallSettings.Builder<DeleteEntryGroupRequest, Empty> deleteEntryGroupSettings() {
       return getStubSettingsBuilder().deleteEntryGroupSettings();
     }
 
-    /** Returns the builder for the settings used for calls to createEntry. */
-    public UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings() {
-      return getStubSettingsBuilder().createEntrySettings();
-    }
-
-    /** Returns the builder for the settings used for calls to updateEntry. */
-    public UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings() {
-      return getStubSettingsBuilder().updateEntrySettings();
-    }
-
     /** Returns the builder for the settings used for calls to deleteEntry. */
     public UnaryCallSettings.Builder<DeleteEntryRequest, Empty> deleteEntrySettings() {
       return getStubSettingsBuilder().deleteEntrySettings();
@@ -360,16 +343,31 @@ public UnaryCallSettings.Builder<LookupEntryRequest, Entry> lookupEntrySettings(
       return getStubSettingsBuilder().lookupEntrySettings();
     }
 
-    /** Returns the builder for the settings used for calls to listEntryGroups. */
-    public UnaryCallSettings.Builder<ListEntryGroupsRequest, ListEntryGroupsResponse>
-        listEntryGroupsSettings() {
-      return getStubSettingsBuilder().listEntryGroupsSettings();
+    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
+    public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
+      return getStubSettingsBuilder().deleteTagTemplateSettings();
     }
 
-    /** Returns the builder for the settings used for calls to listEntries. */
-    public UnaryCallSettings.Builder<ListEntriesRequest, ListEntriesResponse>
-        listEntriesSettings() {
-      return getStubSettingsBuilder().listEntriesSettings();
+    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
+    public UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
+        deleteTagTemplateFieldSettings() {
+      return getStubSettingsBuilder().deleteTagTemplateFieldSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteTag. */
+    public UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings() {
+      return getStubSettingsBuilder().deleteTagSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings() {
+      return getStubSettingsBuilder().getIamPolicySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to createEntryGroup. */
+    public UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
+        createEntryGroupSettings() {
+      return getStubSettingsBuilder().createEntryGroupSettings();
     }
 
     /** Returns the builder for the settings used for calls to updateEntryGroup. */
@@ -378,6 +376,35 @@ public UnaryCallSettings.Builder<LookupEntryRequest, Entry> lookupEntrySettings(
       return getStubSettingsBuilder().updateEntryGroupSettings();
     }
 
+    /** Returns the builder for the settings used for calls to getEntryGroup. */
+    public UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
+      return getStubSettingsBuilder().getEntryGroupSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listEntryGroups. */
+    public PagedCallSettings.Builder<
+            ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+        listEntryGroupsSettings() {
+      return getStubSettingsBuilder().listEntryGroupsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to createEntry. */
+    public UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings() {
+      return getStubSettingsBuilder().createEntrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to updateEntry. */
+    public UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings() {
+      return getStubSettingsBuilder().updateEntrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listEntries. */
+    public PagedCallSettings.Builder<
+            ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+        listEntriesSettings() {
+      return getStubSettingsBuilder().listEntriesSettings();
+    }
+
     /** Returns the builder for the settings used for calls to createTagTemplate. */
     public UnaryCallSettings.Builder<CreateTagTemplateRequest, TagTemplate>
         createTagTemplateSettings() {
@@ -395,11 +422,6 @@ public UnaryCallSettings.Builder<GetTagTemplateRequest, TagTemplate> getTagTempl
       return getStubSettingsBuilder().updateTagTemplateSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
-    public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
-      return getStubSettingsBuilder().deleteTagTemplateSettings();
-    }
-
     /** Returns the builder for the settings used for calls to createTagTemplateField. */
     public UnaryCallSettings.Builder<CreateTagTemplateFieldRequest, TagTemplateField>
         createTagTemplateFieldSettings() {
@@ -418,12 +440,6 @@ public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTempl
       return getStubSettingsBuilder().renameTagTemplateFieldSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
-    public UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
-        deleteTagTemplateFieldSettings() {
-      return getStubSettingsBuilder().deleteTagTemplateFieldSettings();
-    }
-
     /** Returns the builder for the settings used for calls to createTag. */
     public UnaryCallSettings.Builder<CreateTagRequest, Tag> createTagSettings() {
       return getStubSettingsBuilder().createTagSettings();
@@ -434,11 +450,6 @@ public UnaryCallSettings.Builder<UpdateTagRequest, Tag> updateTagSettings() {
       return getStubSettingsBuilder().updateTagSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteTag. */
-    public UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings() {
-      return getStubSettingsBuilder().deleteTagSettings();
-    }
-
     /** Returns the builder for the settings used for calls to listTags. */
     public PagedCallSettings.Builder<ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
         listTagsSettings() {
@@ -450,11 +461,6 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
       return getStubSettingsBuilder().setIamPolicySettings();
     }
 
-    /** Returns the builder for the settings used for calls to getIamPolicy. */
-    public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings() {
-      return getStubSettingsBuilder().getIamPolicySettings();
-    }
-
     /** Returns the builder for the settings used for calls to testIamPermissions. */
     public UnaryCallSettings.Builder<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsSettings() {
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
index 148b5743..824fdcc9 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
@@ -15,11 +15,19 @@
  */
 package com.google.cloud.datacatalog.v1beta1;
 
+import com.google.api.core.ApiFunction;
+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.paging.AbstractFixedSizeCollection;
+import com.google.api.gax.paging.AbstractPage;
+import com.google.api.gax.paging.AbstractPagedListResponse;
+import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1beta1.stub.PolicyTagManagerStub;
 import com.google.cloud.datacatalog.v1beta1.stub.PolicyTagManagerStubSettings;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
@@ -27,6 +35,7 @@
 import com.google.iam.v1.TestIamPermissionsResponse;
 import com.google.protobuf.Empty;
 import java.io.IOException;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -41,8 +50,9 @@
  * <pre>
  * <code>
  * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
- *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
- *   Taxonomy response = policyTagManagerClient.createTaxonomy(request);
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
+ *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent, taxonomy);
  * }
  * </code>
  * </pre>
@@ -160,7 +170,61 @@ public PolicyTagManagerStub getStub() {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
+   *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent, taxonomy);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the project that the taxonomy will belong to.
+   * @param taxonomy The taxonomy to be created.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Taxonomy createTaxonomy(LocationName parent, Taxonomy taxonomy) {
+    CreateTaxonomyRequest request =
+        CreateTaxonomyRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setTaxonomy(taxonomy)
+            .build();
+    return createTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a taxonomy in the specified project.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
+   *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent.toString(), taxonomy);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the project that the taxonomy will belong to.
+   * @param taxonomy The taxonomy to be created.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Taxonomy createTaxonomy(String parent, Taxonomy taxonomy) {
+    CreateTaxonomyRequest request =
+        CreateTaxonomyRequest.newBuilder().setParent(parent).setTaxonomy(taxonomy).build();
+    return createTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a taxonomy in the specified project.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   Taxonomy response = policyTagManagerClient.createTaxonomy(request);
    * }
    * </code></pre>
@@ -180,7 +244,10 @@ public final Taxonomy createTaxonomy(CreateTaxonomyRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ApiFuture&lt;Taxonomy&gt; future = policyTagManagerClient.createTaxonomyCallable().futureCall(request);
    *   // Do something
    *   Taxonomy response = future.get();
@@ -200,7 +267,57 @@ public final UnaryCallable<CreateTaxonomyRequest, Taxonomy> createTaxonomyCallab
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder().build();
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   policyTagManagerClient.deleteTaxonomy(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the taxonomy to be deleted. All policy tags in this
+   *     taxonomy will also be deleted.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTaxonomy(TaxonomyName name) {
+    DeleteTaxonomyRequest request =
+        DeleteTaxonomyRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a taxonomy. This operation will also delete all policy tags in this taxonomy along with
+   * their associated policies.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   policyTagManagerClient.deleteTaxonomy(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the taxonomy to be deleted. All policy tags in this
+   *     taxonomy will also be deleted.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTaxonomy(String name) {
+    DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder().setName(name).build();
+    deleteTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a taxonomy. This operation will also delete all policy tags in this taxonomy along with
+   * their associated policies.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   policyTagManagerClient.deleteTaxonomy(request);
    * }
    * </code></pre>
@@ -221,7 +338,10 @@ public final void deleteTaxonomy(DeleteTaxonomyRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder().build();
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   ApiFuture&lt;Void&gt; future = policyTagManagerClient.deleteTaxonomyCallable().futureCall(request);
    *   // Do something
    *   future.get();
@@ -232,6 +352,29 @@ public final UnaryCallable<DeleteTaxonomyRequest, Empty> deleteTaxonomyCallable(
     return stub.deleteTaxonomyCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
+   *   Taxonomy response = policyTagManagerClient.updateTaxonomy(taxonomy);
+   * }
+   * </code></pre>
+   *
+   * @param taxonomy The taxonomy to update. Only description, display_name, and activated policy
+   *     types can be updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Taxonomy updateTaxonomy(Taxonomy taxonomy) {
+    UpdateTaxonomyRequest request =
+        UpdateTaxonomyRequest.newBuilder().setTaxonomy(taxonomy).build();
+    return updateTaxonomy(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates a taxonomy.
@@ -280,16 +423,72 @@ public final UnaryCallable<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyCallab
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder().build();
-   *   ListTaxonomiesResponse response = policyTagManagerClient.listTaxonomies(request);
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (Taxonomy element : policyTagManagerClient.listTaxonomies(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the project to list the taxonomies of.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListTaxonomiesPagedResponse listTaxonomies(LocationName parent) {
+    ListTaxonomiesRequest request =
+        ListTaxonomiesRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return listTaxonomies(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all taxonomies in a project in a particular location that the caller has permission to
+   * view.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (Taxonomy element : policyTagManagerClient.listTaxonomies(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the project to list the taxonomies of.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListTaxonomiesPagedResponse listTaxonomies(String parent) {
+    ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder().setParent(parent).build();
+    return listTaxonomies(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all taxonomies in a project in a particular location that the caller has permission to
+   * view.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (Taxonomy element : policyTagManagerClient.listTaxonomies(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
    * @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 ListTaxonomiesResponse listTaxonomies(ListTaxonomiesRequest request) {
-    return listTaxonomiesCallable().call(request);
+  public final ListTaxonomiesPagedResponse listTaxonomies(ListTaxonomiesRequest request) {
+    return listTaxonomiesPagedCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -301,10 +500,48 @@ public final ListTaxonomiesResponse listTaxonomies(ListTaxonomiesRequest request
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder().build();
-   *   ApiFuture&lt;ListTaxonomiesResponse&gt; future = policyTagManagerClient.listTaxonomiesCallable().futureCall(request);
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;ListTaxonomiesPagedResponse&gt; future = policyTagManagerClient.listTaxonomiesPagedCallable().futureCall(request);
    *   // Do something
-   *   ListTaxonomiesResponse response = future.get();
+   *   for (Taxonomy element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesPagedResponse>
+      listTaxonomiesPagedCallable() {
+    return stub.listTaxonomiesPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all taxonomies in a project in a particular location that the caller has permission to
+   * view.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListTaxonomiesResponse response = policyTagManagerClient.listTaxonomiesCallable().call(request);
+   *     for (Taxonomy element : response.getTaxonomiesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
    * }
    * </code></pre>
    */
@@ -321,7 +558,53 @@ public final ListTaxonomiesResponse listTaxonomies(ListTaxonomiesRequest request
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder().build();
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   Taxonomy response = policyTagManagerClient.getTaxonomy(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the requested taxonomy.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Taxonomy getTaxonomy(TaxonomyName name) {
+    GetTaxonomyRequest request =
+        GetTaxonomyRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   Taxonomy response = policyTagManagerClient.getTaxonomy(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the requested taxonomy.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Taxonomy getTaxonomy(String name) {
+    GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder().setName(name).build();
+    return getTaxonomy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   Taxonomy response = policyTagManagerClient.getTaxonomy(request);
    * }
    * </code></pre>
@@ -341,7 +624,10 @@ public final Taxonomy getTaxonomy(GetTaxonomyRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder().build();
+   *   TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   ApiFuture&lt;Taxonomy&gt; future = policyTagManagerClient.getTaxonomyCallable().futureCall(request);
    *   // Do something
    *   Taxonomy response = future.get();
@@ -360,7 +646,61 @@ public final UnaryCallable<GetTaxonomyRequest, Taxonomy> getTaxonomyCallable() {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder().build();
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   PolicyTag policyTag = PolicyTag.newBuilder().build();
+   *   PolicyTag response = policyTagManagerClient.createPolicyTag(parent, policyTag);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the taxonomy that the policy tag will belong to.
+   * @param policyTag The policy tag to be created.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PolicyTag createPolicyTag(TaxonomyName parent, PolicyTag policyTag) {
+    CreatePolicyTagRequest request =
+        CreatePolicyTagRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setPolicyTag(policyTag)
+            .build();
+    return createPolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a policy tag in the specified taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   PolicyTag policyTag = PolicyTag.newBuilder().build();
+   *   PolicyTag response = policyTagManagerClient.createPolicyTag(parent.toString(), policyTag);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the taxonomy that the policy tag will belong to.
+   * @param policyTag The policy tag to be created.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PolicyTag createPolicyTag(String parent, PolicyTag policyTag) {
+    CreatePolicyTagRequest request =
+        CreatePolicyTagRequest.newBuilder().setParent(parent).setPolicyTag(policyTag).build();
+    return createPolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a policy tag in the specified taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   PolicyTag response = policyTagManagerClient.createPolicyTag(request);
    * }
    * </code></pre>
@@ -380,7 +720,10 @@ public final PolicyTag createPolicyTag(CreatePolicyTagRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder().build();
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ApiFuture&lt;PolicyTag&gt; future = policyTagManagerClient.createPolicyTagCallable().futureCall(request);
    *   // Do something
    *   PolicyTag response = future.get();
@@ -399,7 +742,55 @@ public final UnaryCallable<CreatePolicyTagRequest, PolicyTag> createPolicyTagCal
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder().build();
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   policyTagManagerClient.deletePolicyTag(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the policy tag to be deleted. All of its descendant
+   *     policy tags will also be deleted.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deletePolicyTag(PolicyTagName name) {
+    DeletePolicyTagRequest request =
+        DeletePolicyTagRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deletePolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a policy tag. Also deletes all of its descendant policy tags.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   policyTagManagerClient.deletePolicyTag(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the policy tag to be deleted. All of its descendant
+   *     policy tags will also be deleted.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deletePolicyTag(String name) {
+    DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder().setName(name).build();
+    deletePolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a policy tag. Also deletes all of its descendant policy tags.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   policyTagManagerClient.deletePolicyTag(request);
    * }
    * </code></pre>
@@ -419,7 +810,10 @@ public final void deletePolicyTag(DeletePolicyTagRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder().build();
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   ApiFuture&lt;Void&gt; future = policyTagManagerClient.deletePolicyTagCallable().futureCall(request);
    *   // Do something
    *   future.get();
@@ -430,6 +824,29 @@ public final UnaryCallable<DeletePolicyTagRequest, Empty> deletePolicyTagCallabl
     return stub.deletePolicyTagCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a policy tag.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   PolicyTag policyTag = PolicyTag.newBuilder().build();
+   *   PolicyTag response = policyTagManagerClient.updatePolicyTag(policyTag);
+   * }
+   * </code></pre>
+   *
+   * @param policyTag The policy tag to update. Only the description, display_name, and
+   *     parent_policy_tag fields can be updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PolicyTag updatePolicyTag(PolicyTag policyTag) {
+    UpdatePolicyTagRequest request =
+        UpdatePolicyTagRequest.newBuilder().setPolicyTag(policyTag).build();
+    return updatePolicyTag(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates a policy tag.
@@ -477,16 +894,70 @@ public final UnaryCallable<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagCal
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder().build();
-   *   ListPolicyTagsResponse response = policyTagManagerClient.listPolicyTags(request);
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   for (PolicyTag element : policyTagManagerClient.listPolicyTags(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the taxonomy to list the policy tags of.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListPolicyTagsPagedResponse listPolicyTags(TaxonomyName parent) {
+    ListPolicyTagsRequest request =
+        ListPolicyTagsRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return listPolicyTags(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all policy tags in a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   for (PolicyTag element : policyTagManagerClient.listPolicyTags(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. Resource name of the taxonomy to list the policy tags of.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListPolicyTagsPagedResponse listPolicyTags(String parent) {
+    ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder().setParent(parent).build();
+    return listPolicyTags(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all policy tags in a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (PolicyTag element : policyTagManagerClient.listPolicyTags(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
    * @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 ListPolicyTagsResponse listPolicyTags(ListPolicyTagsRequest request) {
-    return listPolicyTagsCallable().call(request);
+  public final ListPolicyTagsPagedResponse listPolicyTags(ListPolicyTagsRequest request) {
+    return listPolicyTagsPagedCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -497,10 +968,47 @@ public final ListPolicyTagsResponse listPolicyTags(ListPolicyTagsRequest request
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder().build();
-   *   ApiFuture&lt;ListPolicyTagsResponse&gt; future = policyTagManagerClient.listPolicyTagsCallable().futureCall(request);
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;ListPolicyTagsPagedResponse&gt; future = policyTagManagerClient.listPolicyTagsPagedCallable().futureCall(request);
    *   // Do something
-   *   ListPolicyTagsResponse response = future.get();
+   *   for (PolicyTag element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsPagedResponse>
+      listPolicyTagsPagedCallable() {
+    return stub.listPolicyTagsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists all policy tags in a taxonomy.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListPolicyTagsResponse response = policyTagManagerClient.listPolicyTagsCallable().call(request);
+   *     for (PolicyTag element : response.getPolicyTagsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
    * }
    * </code></pre>
    */
@@ -517,7 +1025,53 @@ public final ListPolicyTagsResponse listPolicyTags(ListPolicyTagsRequest request
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder().build();
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   PolicyTag response = policyTagManagerClient.getPolicyTag(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the requested policy tag.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PolicyTag getPolicyTag(PolicyTagName name) {
+    GetPolicyTagRequest request =
+        GetPolicyTagRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getPolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a policy tag.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   PolicyTag response = policyTagManagerClient.getPolicyTag(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the requested policy tag.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PolicyTag getPolicyTag(String name) {
+    GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder().setName(name).build();
+    return getPolicyTag(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a policy tag.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   PolicyTag response = policyTagManagerClient.getPolicyTag(request);
    * }
    * </code></pre>
@@ -537,7 +1091,10 @@ public final PolicyTag getPolicyTag(GetPolicyTagRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder().build();
+   *   PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
+   *   GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   ApiFuture&lt;PolicyTag&gt; future = policyTagManagerClient.getPolicyTagCallable().futureCall(request);
    *   // Do something
    *   PolicyTag response = future.get();
@@ -556,7 +1113,10 @@ public final UnaryCallable<GetPolicyTagRequest, PolicyTag> getPolicyTagCallable(
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
    *   Policy response = policyTagManagerClient.getIamPolicy(request);
    * }
    * </code></pre>
@@ -576,7 +1136,10 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
    *   ApiFuture&lt;Policy&gt; future = policyTagManagerClient.getIamPolicyCallable().futureCall(request);
    *   // Do something
    *   Policy response = future.get();
@@ -595,7 +1158,12 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .setPolicy(policy)
+   *     .build();
    *   Policy response = policyTagManagerClient.setIamPolicy(request);
    * }
    * </code></pre>
@@ -615,7 +1183,12 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .setPolicy(policy)
+   *     .build();
    *   ApiFuture&lt;Policy&gt; future = policyTagManagerClient.setIamPolicyCallable().futureCall(request);
    *   // Do something
    *   Policy response = future.get();
@@ -634,7 +1207,12 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
+   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .addAllPermissions(permissions)
+   *     .build();
    *   TestIamPermissionsResponse response = policyTagManagerClient.testIamPermissions(request);
    * }
    * </code></pre>
@@ -654,7 +1232,12 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    *
    * <pre><code>
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder().build();
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
+   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .addAllPermissions(permissions)
+   *     .build();
    *   ApiFuture&lt;TestIamPermissionsResponse&gt; future = policyTagManagerClient.testIamPermissionsCallable().futureCall(request);
    *   // Do something
    *   TestIamPermissionsResponse response = future.get();
@@ -695,4 +1278,166 @@ public void shutdownNow() {
   public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
     return stub.awaitTermination(duration, unit);
   }
+
+  public static class ListTaxonomiesPagedResponse
+      extends AbstractPagedListResponse<
+          ListTaxonomiesRequest,
+          ListTaxonomiesResponse,
+          Taxonomy,
+          ListTaxonomiesPage,
+          ListTaxonomiesFixedSizeCollection> {
+
+    public static ApiFuture<ListTaxonomiesPagedResponse> createAsync(
+        PageContext<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy> context,
+        ApiFuture<ListTaxonomiesResponse> futureResponse) {
+      ApiFuture<ListTaxonomiesPage> futurePage =
+          ListTaxonomiesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<ListTaxonomiesPage, ListTaxonomiesPagedResponse>() {
+            @Override
+            public ListTaxonomiesPagedResponse apply(ListTaxonomiesPage input) {
+              return new ListTaxonomiesPagedResponse(input);
+            }
+          },
+          MoreExecutors.directExecutor());
+    }
+
+    private ListTaxonomiesPagedResponse(ListTaxonomiesPage page) {
+      super(page, ListTaxonomiesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListTaxonomiesPage
+      extends AbstractPage<
+          ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy, ListTaxonomiesPage> {
+
+    private ListTaxonomiesPage(
+        PageContext<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy> context,
+        ListTaxonomiesResponse response) {
+      super(context, response);
+    }
+
+    private static ListTaxonomiesPage createEmptyPage() {
+      return new ListTaxonomiesPage(null, null);
+    }
+
+    @Override
+    protected ListTaxonomiesPage createPage(
+        PageContext<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy> context,
+        ListTaxonomiesResponse response) {
+      return new ListTaxonomiesPage(context, response);
+    }
+
+    @Override
+    public ApiFuture<ListTaxonomiesPage> createPageAsync(
+        PageContext<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy> context,
+        ApiFuture<ListTaxonomiesResponse> futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListTaxonomiesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListTaxonomiesRequest,
+          ListTaxonomiesResponse,
+          Taxonomy,
+          ListTaxonomiesPage,
+          ListTaxonomiesFixedSizeCollection> {
+
+    private ListTaxonomiesFixedSizeCollection(List<ListTaxonomiesPage> pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListTaxonomiesFixedSizeCollection createEmptyCollection() {
+      return new ListTaxonomiesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListTaxonomiesFixedSizeCollection createCollection(
+        List<ListTaxonomiesPage> pages, int collectionSize) {
+      return new ListTaxonomiesFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListPolicyTagsPagedResponse
+      extends AbstractPagedListResponse<
+          ListPolicyTagsRequest,
+          ListPolicyTagsResponse,
+          PolicyTag,
+          ListPolicyTagsPage,
+          ListPolicyTagsFixedSizeCollection> {
+
+    public static ApiFuture<ListPolicyTagsPagedResponse> createAsync(
+        PageContext<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag> context,
+        ApiFuture<ListPolicyTagsResponse> futureResponse) {
+      ApiFuture<ListPolicyTagsPage> futurePage =
+          ListPolicyTagsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction<ListPolicyTagsPage, ListPolicyTagsPagedResponse>() {
+            @Override
+            public ListPolicyTagsPagedResponse apply(ListPolicyTagsPage input) {
+              return new ListPolicyTagsPagedResponse(input);
+            }
+          },
+          MoreExecutors.directExecutor());
+    }
+
+    private ListPolicyTagsPagedResponse(ListPolicyTagsPage page) {
+      super(page, ListPolicyTagsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListPolicyTagsPage
+      extends AbstractPage<
+          ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag, ListPolicyTagsPage> {
+
+    private ListPolicyTagsPage(
+        PageContext<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag> context,
+        ListPolicyTagsResponse response) {
+      super(context, response);
+    }
+
+    private static ListPolicyTagsPage createEmptyPage() {
+      return new ListPolicyTagsPage(null, null);
+    }
+
+    @Override
+    protected ListPolicyTagsPage createPage(
+        PageContext<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag> context,
+        ListPolicyTagsResponse response) {
+      return new ListPolicyTagsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture<ListPolicyTagsPage> createPageAsync(
+        PageContext<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag> context,
+        ApiFuture<ListPolicyTagsResponse> futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListPolicyTagsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListPolicyTagsRequest,
+          ListPolicyTagsResponse,
+          PolicyTag,
+          ListPolicyTagsPage,
+          ListPolicyTagsFixedSizeCollection> {
+
+    private ListPolicyTagsFixedSizeCollection(List<ListPolicyTagsPage> pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListPolicyTagsFixedSizeCollection createEmptyCollection() {
+      return new ListPolicyTagsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListPolicyTagsFixedSizeCollection createCollection(
+        List<ListPolicyTagsPage> pages, int collectionSize) {
+      return new ListPolicyTagsFixedSizeCollection(pages, collectionSize);
+    }
+  }
 }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
index 00102550..113b6571 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
@@ -35,7 +35,10 @@
  * <pre>
  * <code>
  * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
- *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder()
+ *     .setParent(parent.toString())
+ *     .build();
  *   ImportTaxonomiesResponse response = policyTagManagerSerializationClient.importTaxonomies(request);
  * }
  * </code>
@@ -160,7 +163,10 @@ public PolicyTagManagerSerializationStub getStub() {
    *
    * <pre><code>
    * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
-   *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ImportTaxonomiesResponse response = policyTagManagerSerializationClient.importTaxonomies(request);
    * }
    * </code></pre>
@@ -182,7 +188,10 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *
    * <pre><code>
    * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
-   *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ApiFuture&lt;ImportTaxonomiesResponse&gt; future = policyTagManagerSerializationClient.importTaxonomiesCallable().futureCall(request);
    *   // Do something
    *   ImportTaxonomiesResponse response = future.get();
@@ -205,7 +214,12 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *
    * <pre><code>
    * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
-   *   ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   List&lt;TaxonomyName&gt; taxonomies = new ArrayList&lt;&gt;();
+   *   ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .addAllTaxonomies(TaxonomyName.toStringList(taxonomies))
+   *     .build();
    *   ExportTaxonomiesResponse response = policyTagManagerSerializationClient.exportTaxonomies(request);
    * }
    * </code></pre>
@@ -228,7 +242,12 @@ public final ExportTaxonomiesResponse exportTaxonomies(ExportTaxonomiesRequest r
    *
    * <pre><code>
    * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
-   *   ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder().build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   List&lt;TaxonomyName&gt; taxonomies = new ArrayList&lt;&gt;();
+   *   ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .addAllTaxonomies(TaxonomyName.toStringList(taxonomies))
+   *     .build();
    *   ApiFuture&lt;ExportTaxonomiesResponse&gt; future = policyTagManagerSerializationClient.exportTaxonomiesCallable().futureCall(request);
    *   // Do something
    *   ExportTaxonomiesResponse response = future.get();
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
index 7c68ebaf..538b7705 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
@@ -15,6 +15,9 @@
  */
 package com.google.cloud.datacatalog.v1beta1;
 
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListPolicyTagsPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListTaxonomiesPagedResponse;
+
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.GoogleCredentialsProvider;
@@ -23,6 +26,7 @@
 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.PagedCallSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.cloud.datacatalog.v1beta1.stub.PolicyTagManagerStubSettings;
@@ -86,7 +90,9 @@ public UnaryCallSettings<UpdateTaxonomyRequest, Taxonomy> updateTaxonomySettings
   }
 
   /** Returns the object with the settings used for calls to listTaxonomies. */
-  public UnaryCallSettings<ListTaxonomiesRequest, ListTaxonomiesResponse> listTaxonomiesSettings() {
+  public PagedCallSettings<
+          ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
+      listTaxonomiesSettings() {
     return ((PolicyTagManagerStubSettings) getStubSettings()).listTaxonomiesSettings();
   }
 
@@ -111,7 +117,9 @@ public UnaryCallSettings<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagSetti
   }
 
   /** Returns the object with the settings used for calls to listPolicyTags. */
-  public UnaryCallSettings<ListPolicyTagsRequest, ListPolicyTagsResponse> listPolicyTagsSettings() {
+  public PagedCallSettings<
+          ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
+      listPolicyTagsSettings() {
     return ((PolicyTagManagerStubSettings) getStubSettings()).listPolicyTagsSettings();
   }
 
@@ -249,7 +257,8 @@ public UnaryCallSettings.Builder<UpdateTaxonomyRequest, Taxonomy> updateTaxonomy
     }
 
     /** Returns the builder for the settings used for calls to listTaxonomies. */
-    public UnaryCallSettings.Builder<ListTaxonomiesRequest, ListTaxonomiesResponse>
+    public PagedCallSettings.Builder<
+            ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
         listTaxonomiesSettings() {
       return getStubSettingsBuilder().listTaxonomiesSettings();
     }
@@ -275,7 +284,8 @@ public UnaryCallSettings.Builder<UpdatePolicyTagRequest, PolicyTag> updatePolicy
     }
 
     /** Returns the builder for the settings used for calls to listPolicyTags. */
-    public UnaryCallSettings.Builder<ListPolicyTagsRequest, ListPolicyTagsResponse>
+    public PagedCallSettings.Builder<
+            ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
         listPolicyTagsSettings() {
       return getStubSettingsBuilder().listPolicyTagsSettings();
     }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
index de69af61..b0ee4b3e 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
@@ -29,10 +29,8 @@
  * <pre>
  * <code>
  * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
- *   String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
- *   String entryGroupId = "";
- *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
- *   EntryGroup response = dataCatalogClient.createEntryGroup(formattedParent, entryGroupId, entryGroup);
+ *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+ *   dataCatalogClient.deleteEntryGroup(name);
  * }
  * </code>
  * </pre>
@@ -47,8 +45,9 @@
  * <pre>
  * <code>
  * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
- *   CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
- *   Taxonomy response = policyTagManagerClient.createTaxonomy(request);
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
+ *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent, taxonomy);
  * }
  * </code>
  * </pre>
@@ -64,7 +63,10 @@
  * <pre>
  * <code>
  * try (PolicyTagManagerSerializationClient policyTagManagerSerializationClient = PolicyTagManagerSerializationClient.create()) {
- *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder()
+ *     .setParent(parent.toString())
+ *     .build();
  *   ImportTaxonomiesResponse response = policyTagManagerSerializationClient.importTaxonomies(request);
  * }
  * </code>
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStub.java
index 6fd1242d..cf044518 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStub.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntriesPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntryGroupsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListTagsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.SearchCatalogPagedResponse;
 
@@ -81,26 +83,10 @@ public UnaryCallable<SearchCatalogRequest, SearchCatalogResponse> searchCatalogC
     throw new UnsupportedOperationException("Not implemented: searchCatalogCallable()");
   }
 
-  public UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
-    throw new UnsupportedOperationException("Not implemented: createEntryGroupCallable()");
-  }
-
-  public UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
-    throw new UnsupportedOperationException("Not implemented: getEntryGroupCallable()");
-  }
-
   public UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteEntryGroupCallable()");
   }
 
-  public UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
-    throw new UnsupportedOperationException("Not implemented: createEntryCallable()");
-  }
-
-  public UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
-    throw new UnsupportedOperationException("Not implemented: updateEntryCallable()");
-  }
-
   public UnaryCallable<DeleteEntryRequest, Empty> deleteEntryCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteEntryCallable()");
   }
@@ -113,18 +99,59 @@ public UnaryCallable<LookupEntryRequest, Entry> lookupEntryCallable() {
     throw new UnsupportedOperationException("Not implemented: lookupEntryCallable()");
   }
 
-  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse> listEntryGroupsCallable() {
-    throw new UnsupportedOperationException("Not implemented: listEntryGroupsCallable()");
+  public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateCallable()");
   }
 
-  public UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
-    throw new UnsupportedOperationException("Not implemented: listEntriesCallable()");
+  public UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateFieldCallable()");
+  }
+
+  public UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagCallable()");
+  }
+
+  public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
+    throw new UnsupportedOperationException("Not implemented: getIamPolicyCallable()");
+  }
+
+  public UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
+    throw new UnsupportedOperationException("Not implemented: createEntryGroupCallable()");
   }
 
   public UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable() {
     throw new UnsupportedOperationException("Not implemented: updateEntryGroupCallable()");
   }
 
+  public UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
+    throw new UnsupportedOperationException("Not implemented: getEntryGroupCallable()");
+  }
+
+  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsPagedResponse>
+      listEntryGroupsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listEntryGroupsPagedCallable()");
+  }
+
+  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse> listEntryGroupsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listEntryGroupsCallable()");
+  }
+
+  public UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
+    throw new UnsupportedOperationException("Not implemented: createEntryCallable()");
+  }
+
+  public UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
+    throw new UnsupportedOperationException("Not implemented: updateEntryCallable()");
+  }
+
+  public UnaryCallable<ListEntriesRequest, ListEntriesPagedResponse> listEntriesPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listEntriesPagedCallable()");
+  }
+
+  public UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listEntriesCallable()");
+  }
+
   public UnaryCallable<CreateTagTemplateRequest, TagTemplate> createTagTemplateCallable() {
     throw new UnsupportedOperationException("Not implemented: createTagTemplateCallable()");
   }
@@ -137,10 +164,6 @@ public UnaryCallable<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateCal
     throw new UnsupportedOperationException("Not implemented: updateTagTemplateCallable()");
   }
 
-  public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateCallable()");
-  }
-
   public UnaryCallable<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldCallable() {
     throw new UnsupportedOperationException("Not implemented: createTagTemplateFieldCallable()");
@@ -156,10 +179,6 @@ public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable(
     throw new UnsupportedOperationException("Not implemented: renameTagTemplateFieldCallable()");
   }
 
-  public UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateFieldCallable()");
-  }
-
   public UnaryCallable<CreateTagRequest, Tag> createTagCallable() {
     throw new UnsupportedOperationException("Not implemented: createTagCallable()");
   }
@@ -168,10 +187,6 @@ public UnaryCallable<UpdateTagRequest, Tag> updateTagCallable() {
     throw new UnsupportedOperationException("Not implemented: updateTagCallable()");
   }
 
-  public UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagCallable()");
-  }
-
   public UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listTagsPagedCallable()");
   }
@@ -184,10 +199,6 @@ public UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
     throw new UnsupportedOperationException("Not implemented: setIamPolicyCallable()");
   }
 
-  public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
-    throw new UnsupportedOperationException("Not implemented: getIamPolicyCallable()");
-  }
-
   public UnaryCallable<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsCallable() {
     throw new UnsupportedOperationException("Not implemented: testIamPermissionsCallable()");
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStubSettings.java
index c0ff684c..4263a4be 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStubSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStubSettings.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntriesPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntryGroupsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListTagsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.SearchCatalogPagedResponse;
 
@@ -104,16 +106,16 @@
  * <p>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.
  *
- * <p>For example, to set the total timeout of createEntryGroup to 30 seconds:
+ * <p>For example, to set the total timeout of deleteEntryGroup to 30 seconds:
  *
  * <pre>
  * <code>
  * DataCatalogStubSettings.Builder dataCatalogSettingsBuilder =
  *     DataCatalogStubSettings.newBuilder();
  * dataCatalogSettingsBuilder
- *     .createEntryGroupSettings()
+ *     .deleteEntryGroupSettings()
  *     .setRetrySettings(
- *         dataCatalogSettingsBuilder.createEntryGroupSettings().getRetrySettings().toBuilder()
+ *         dataCatalogSettingsBuilder.deleteEntryGroupSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DataCatalogStubSettings dataCatalogSettings = dataCatalogSettingsBuilder.build();
@@ -130,37 +132,39 @@ public class DataCatalogStubSettings extends StubSettings<DataCatalogStubSetting
   private final PagedCallSettings<
           SearchCatalogRequest, SearchCatalogResponse, SearchCatalogPagedResponse>
       searchCatalogSettings;
-  private final UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings;
-  private final UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings;
   private final UnaryCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupSettings;
-  private final UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings;
-  private final UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings;
   private final UnaryCallSettings<DeleteEntryRequest, Empty> deleteEntrySettings;
   private final UnaryCallSettings<GetEntryRequest, Entry> getEntrySettings;
   private final UnaryCallSettings<LookupEntryRequest, Entry> lookupEntrySettings;
-  private final UnaryCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
-      listEntryGroupsSettings;
-  private final UnaryCallSettings<ListEntriesRequest, ListEntriesResponse> listEntriesSettings;
+  private final UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings;
+  private final UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty>
+      deleteTagTemplateFieldSettings;
+  private final UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings;
+  private final UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings;
+  private final UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings;
   private final UnaryCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupSettings;
+  private final UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings;
+  private final PagedCallSettings<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+      listEntryGroupsSettings;
+  private final UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings;
+  private final UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings;
+  private final PagedCallSettings<ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+      listEntriesSettings;
   private final UnaryCallSettings<CreateTagTemplateRequest, TagTemplate> createTagTemplateSettings;
   private final UnaryCallSettings<GetTagTemplateRequest, TagTemplate> getTagTemplateSettings;
   private final UnaryCallSettings<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateSettings;
-  private final UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings;
   private final UnaryCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldSettings;
   private final UnaryCallSettings<UpdateTagTemplateFieldRequest, TagTemplateField>
       updateTagTemplateFieldSettings;
   private final UnaryCallSettings<RenameTagTemplateFieldRequest, TagTemplateField>
       renameTagTemplateFieldSettings;
-  private final UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty>
-      deleteTagTemplateFieldSettings;
   private final UnaryCallSettings<CreateTagRequest, Tag> createTagSettings;
   private final UnaryCallSettings<UpdateTagRequest, Tag> updateTagSettings;
-  private final UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings;
   private final PagedCallSettings<ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
       listTagsSettings;
   private final UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings;
-  private final UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings;
   private final UnaryCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsSettings;
 
@@ -170,31 +174,11 @@ public class DataCatalogStubSettings extends StubSettings<DataCatalogStubSetting
     return searchCatalogSettings;
   }
 
-  /** Returns the object with the settings used for calls to createEntryGroup. */
-  public UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings() {
-    return createEntryGroupSettings;
-  }
-
-  /** Returns the object with the settings used for calls to getEntryGroup. */
-  public UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
-    return getEntryGroupSettings;
-  }
-
   /** Returns the object with the settings used for calls to deleteEntryGroup. */
   public UnaryCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupSettings() {
     return deleteEntryGroupSettings;
   }
 
-  /** Returns the object with the settings used for calls to createEntry. */
-  public UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings() {
-    return createEntrySettings;
-  }
-
-  /** Returns the object with the settings used for calls to updateEntry. */
-  public UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings() {
-    return updateEntrySettings;
-  }
-
   /** Returns the object with the settings used for calls to deleteEntry. */
   public UnaryCallSettings<DeleteEntryRequest, Empty> deleteEntrySettings() {
     return deleteEntrySettings;
@@ -210,15 +194,29 @@ public UnaryCallSettings<LookupEntryRequest, Entry> lookupEntrySettings() {
     return lookupEntrySettings;
   }
 
-  /** Returns the object with the settings used for calls to listEntryGroups. */
-  public UnaryCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
-      listEntryGroupsSettings() {
-    return listEntryGroupsSettings;
+  /** Returns the object with the settings used for calls to deleteTagTemplate. */
+  public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
+    return deleteTagTemplateSettings;
   }
 
-  /** Returns the object with the settings used for calls to listEntries. */
-  public UnaryCallSettings<ListEntriesRequest, ListEntriesResponse> listEntriesSettings() {
-    return listEntriesSettings;
+  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
+  public UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldSettings() {
+    return deleteTagTemplateFieldSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteTag. */
+  public UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings() {
+    return deleteTagSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
+    return getIamPolicySettings;
+  }
+
+  /** Returns the object with the settings used for calls to createEntryGroup. */
+  public UnaryCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupSettings() {
+    return createEntryGroupSettings;
   }
 
   /** Returns the object with the settings used for calls to updateEntryGroup. */
@@ -226,6 +224,34 @@ public UnaryCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupSe
     return updateEntryGroupSettings;
   }
 
+  /** Returns the object with the settings used for calls to getEntryGroup. */
+  public UnaryCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
+    return getEntryGroupSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listEntryGroups. */
+  public PagedCallSettings<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+      listEntryGroupsSettings() {
+    return listEntryGroupsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to createEntry. */
+  public UnaryCallSettings<CreateEntryRequest, Entry> createEntrySettings() {
+    return createEntrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to updateEntry. */
+  public UnaryCallSettings<UpdateEntryRequest, Entry> updateEntrySettings() {
+    return updateEntrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to listEntries. */
+  public PagedCallSettings<ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+      listEntriesSettings() {
+    return listEntriesSettings;
+  }
+
   /** Returns the object with the settings used for calls to createTagTemplate. */
   public UnaryCallSettings<CreateTagTemplateRequest, TagTemplate> createTagTemplateSettings() {
     return createTagTemplateSettings;
@@ -241,11 +267,6 @@ public UnaryCallSettings<UpdateTagTemplateRequest, TagTemplate> updateTagTemplat
     return updateTagTemplateSettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplate. */
-  public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
-    return deleteTagTemplateSettings;
-  }
-
   /** Returns the object with the settings used for calls to createTagTemplateField. */
   public UnaryCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldSettings() {
@@ -264,11 +285,6 @@ public UnaryCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateSetti
     return renameTagTemplateFieldSettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
-  public UnaryCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldSettings() {
-    return deleteTagTemplateFieldSettings;
-  }
-
   /** Returns the object with the settings used for calls to createTag. */
   public UnaryCallSettings<CreateTagRequest, Tag> createTagSettings() {
     return createTagSettings;
@@ -279,11 +295,6 @@ public UnaryCallSettings<UpdateTagRequest, Tag> updateTagSettings() {
     return updateTagSettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteTag. */
-  public UnaryCallSettings<DeleteTagRequest, Empty> deleteTagSettings() {
-    return deleteTagSettings;
-  }
-
   /** Returns the object with the settings used for calls to listTags. */
   public PagedCallSettings<ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
       listTagsSettings() {
@@ -295,11 +306,6 @@ public UnaryCallSettings<SetIamPolicyRequest, Policy> setIamPolicySettings() {
     return setIamPolicySettings;
   }
 
-  /** Returns the object with the settings used for calls to getIamPolicy. */
-  public UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings() {
-    return getIamPolicySettings;
-  }
-
   /** Returns the object with the settings used for calls to testIamPermissions. */
   public UnaryCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsSettings() {
@@ -376,31 +382,31 @@ protected DataCatalogStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
     searchCatalogSettings = settingsBuilder.searchCatalogSettings().build();
-    createEntryGroupSettings = settingsBuilder.createEntryGroupSettings().build();
-    getEntryGroupSettings = settingsBuilder.getEntryGroupSettings().build();
     deleteEntryGroupSettings = settingsBuilder.deleteEntryGroupSettings().build();
-    createEntrySettings = settingsBuilder.createEntrySettings().build();
-    updateEntrySettings = settingsBuilder.updateEntrySettings().build();
     deleteEntrySettings = settingsBuilder.deleteEntrySettings().build();
     getEntrySettings = settingsBuilder.getEntrySettings().build();
     lookupEntrySettings = settingsBuilder.lookupEntrySettings().build();
+    deleteTagTemplateSettings = settingsBuilder.deleteTagTemplateSettings().build();
+    deleteTagTemplateFieldSettings = settingsBuilder.deleteTagTemplateFieldSettings().build();
+    deleteTagSettings = settingsBuilder.deleteTagSettings().build();
+    getIamPolicySettings = settingsBuilder.getIamPolicySettings().build();
+    createEntryGroupSettings = settingsBuilder.createEntryGroupSettings().build();
+    updateEntryGroupSettings = settingsBuilder.updateEntryGroupSettings().build();
+    getEntryGroupSettings = settingsBuilder.getEntryGroupSettings().build();
     listEntryGroupsSettings = settingsBuilder.listEntryGroupsSettings().build();
+    createEntrySettings = settingsBuilder.createEntrySettings().build();
+    updateEntrySettings = settingsBuilder.updateEntrySettings().build();
     listEntriesSettings = settingsBuilder.listEntriesSettings().build();
-    updateEntryGroupSettings = settingsBuilder.updateEntryGroupSettings().build();
     createTagTemplateSettings = settingsBuilder.createTagTemplateSettings().build();
     getTagTemplateSettings = settingsBuilder.getTagTemplateSettings().build();
     updateTagTemplateSettings = settingsBuilder.updateTagTemplateSettings().build();
-    deleteTagTemplateSettings = settingsBuilder.deleteTagTemplateSettings().build();
     createTagTemplateFieldSettings = settingsBuilder.createTagTemplateFieldSettings().build();
     updateTagTemplateFieldSettings = settingsBuilder.updateTagTemplateFieldSettings().build();
     renameTagTemplateFieldSettings = settingsBuilder.renameTagTemplateFieldSettings().build();
-    deleteTagTemplateFieldSettings = settingsBuilder.deleteTagTemplateFieldSettings().build();
     createTagSettings = settingsBuilder.createTagSettings().build();
     updateTagSettings = settingsBuilder.updateTagSettings().build();
-    deleteTagSettings = settingsBuilder.deleteTagSettings().build();
     listTagsSettings = settingsBuilder.listTagsSettings().build();
     setIamPolicySettings = settingsBuilder.setIamPolicySettings().build();
-    getIamPolicySettings = settingsBuilder.getIamPolicySettings().build();
     testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
   }
 
@@ -442,6 +448,81 @@ public Iterable<SearchCatalogResult> extractResources(SearchCatalogResponse payl
             }
           };
 
+  private static final PagedListDescriptor<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup>
+      LIST_ENTRY_GROUPS_PAGE_STR_DESC =
+          new PagedListDescriptor<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListEntryGroupsRequest injectToken(
+                ListEntryGroupsRequest payload, String token) {
+              return ListEntryGroupsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListEntryGroupsRequest injectPageSize(
+                ListEntryGroupsRequest payload, int pageSize) {
+              return ListEntryGroupsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListEntryGroupsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListEntryGroupsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable<EntryGroup> extractResources(ListEntryGroupsResponse payload) {
+              return payload.getEntryGroupsList() != null
+                  ? payload.getEntryGroupsList()
+                  : ImmutableList.<EntryGroup>of();
+            }
+          };
+
+  private static final PagedListDescriptor<ListEntriesRequest, ListEntriesResponse, Entry>
+      LIST_ENTRIES_PAGE_STR_DESC =
+          new PagedListDescriptor<ListEntriesRequest, ListEntriesResponse, Entry>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListEntriesRequest injectToken(ListEntriesRequest payload, String token) {
+              return ListEntriesRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListEntriesRequest injectPageSize(ListEntriesRequest payload, int pageSize) {
+              return ListEntriesRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListEntriesRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListEntriesResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable<Entry> extractResources(ListEntriesResponse payload) {
+              return payload.getEntriesList() != null
+                  ? payload.getEntriesList()
+                  : ImmutableList.<Entry>of();
+            }
+          };
+
   private static final PagedListDescriptor<ListTagsRequest, ListTagsResponse, Tag>
       LIST_TAGS_PAGE_STR_DESC =
           new PagedListDescriptor<ListTagsRequest, ListTagsResponse, Tag>() {
@@ -496,6 +577,40 @@ public ApiFuture<SearchCatalogPagedResponse> getFuturePagedResponse(
             }
           };
 
+  private static final PagedListResponseFactory<
+          ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+      LIST_ENTRY_GROUPS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>() {
+            @Override
+            public ApiFuture<ListEntryGroupsPagedResponse> getFuturePagedResponse(
+                UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse> callable,
+                ListEntryGroupsRequest request,
+                ApiCallContext context,
+                ApiFuture<ListEntryGroupsResponse> futureResponse) {
+              PageContext<ListEntryGroupsRequest, ListEntryGroupsResponse, EntryGroup> pageContext =
+                  PageContext.create(callable, LIST_ENTRY_GROUPS_PAGE_STR_DESC, request, context);
+              return ListEntryGroupsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+      LIST_ENTRIES_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>() {
+            @Override
+            public ApiFuture<ListEntriesPagedResponse> getFuturePagedResponse(
+                UnaryCallable<ListEntriesRequest, ListEntriesResponse> callable,
+                ListEntriesRequest request,
+                ApiCallContext context,
+                ApiFuture<ListEntriesResponse> futureResponse) {
+              PageContext<ListEntriesRequest, ListEntriesResponse, Entry> pageContext =
+                  PageContext.create(callable, LIST_ENTRIES_PAGE_STR_DESC, request, context);
+              return ListEntriesPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
   private static final PagedListResponseFactory<
           ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
       LIST_TAGS_PAGE_STR_FACT =
@@ -519,46 +634,48 @@ public static class Builder extends StubSettings.Builder<DataCatalogStubSettings
     private final PagedCallSettings.Builder<
             SearchCatalogRequest, SearchCatalogResponse, SearchCatalogPagedResponse>
         searchCatalogSettings;
-    private final UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
-        createEntryGroupSettings;
-    private final UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings;
     private final UnaryCallSettings.Builder<DeleteEntryGroupRequest, Empty>
         deleteEntryGroupSettings;
-    private final UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings;
-    private final UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings;
     private final UnaryCallSettings.Builder<DeleteEntryRequest, Empty> deleteEntrySettings;
     private final UnaryCallSettings.Builder<GetEntryRequest, Entry> getEntrySettings;
     private final UnaryCallSettings.Builder<LookupEntryRequest, Entry> lookupEntrySettings;
-    private final UnaryCallSettings.Builder<ListEntryGroupsRequest, ListEntryGroupsResponse>
-        listEntryGroupsSettings;
-    private final UnaryCallSettings.Builder<ListEntriesRequest, ListEntriesResponse>
-        listEntriesSettings;
+    private final UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty>
+        deleteTagTemplateSettings;
+    private final UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
+        deleteTagTemplateFieldSettings;
+    private final UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings;
+    private final UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings;
+    private final UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
+        createEntryGroupSettings;
     private final UnaryCallSettings.Builder<UpdateEntryGroupRequest, EntryGroup>
         updateEntryGroupSettings;
+    private final UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings;
+    private final PagedCallSettings.Builder<
+            ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+        listEntryGroupsSettings;
+    private final UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings;
+    private final UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings;
+    private final PagedCallSettings.Builder<
+            ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+        listEntriesSettings;
     private final UnaryCallSettings.Builder<CreateTagTemplateRequest, TagTemplate>
         createTagTemplateSettings;
     private final UnaryCallSettings.Builder<GetTagTemplateRequest, TagTemplate>
         getTagTemplateSettings;
     private final UnaryCallSettings.Builder<UpdateTagTemplateRequest, TagTemplate>
         updateTagTemplateSettings;
-    private final UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty>
-        deleteTagTemplateSettings;
     private final UnaryCallSettings.Builder<CreateTagTemplateFieldRequest, TagTemplateField>
         createTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder<UpdateTagTemplateFieldRequest, TagTemplateField>
         updateTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder<RenameTagTemplateFieldRequest, TagTemplateField>
         renameTagTemplateFieldSettings;
-    private final UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
-        deleteTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder<CreateTagRequest, Tag> createTagSettings;
     private final UnaryCallSettings.Builder<UpdateTagRequest, Tag> updateTagSettings;
-    private final UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings;
     private final PagedCallSettings.Builder<
             ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
         listTagsSettings;
     private final UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettings;
-    private final UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings;
     private final UnaryCallSettings.Builder<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsSettings;
 
@@ -605,86 +722,86 @@ protected Builder(ClientContext clientContext) {
 
       searchCatalogSettings = PagedCallSettings.newBuilder(SEARCH_CATALOG_PAGE_STR_FACT);
 
-      createEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      getEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       deleteEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      createEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      updateEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       deleteEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       lookupEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      listEntryGroupsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      deleteTagTemplateSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteTagTemplateFieldSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      listEntriesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      getIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      createEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      getEntryGroupSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listEntryGroupsSettings = PagedCallSettings.newBuilder(LIST_ENTRY_GROUPS_PAGE_STR_FACT);
+
+      createEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      updateEntrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listEntriesSettings = PagedCallSettings.newBuilder(LIST_ENTRIES_PAGE_STR_FACT);
+
       createTagTemplateSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getTagTemplateSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateTagTemplateSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      deleteTagTemplateSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createTagTemplateFieldSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateTagTemplateFieldSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       renameTagTemplateFieldSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      deleteTagTemplateFieldSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      deleteTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       listTagsSettings = PagedCallSettings.newBuilder(LIST_TAGS_PAGE_STR_FACT);
 
       setIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      getIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       testIamPermissionsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
               searchCatalogSettings,
-              createEntryGroupSettings,
-              getEntryGroupSettings,
               deleteEntryGroupSettings,
-              createEntrySettings,
-              updateEntrySettings,
               deleteEntrySettings,
               getEntrySettings,
               lookupEntrySettings,
+              deleteTagTemplateSettings,
+              deleteTagTemplateFieldSettings,
+              deleteTagSettings,
+              getIamPolicySettings,
+              createEntryGroupSettings,
+              updateEntryGroupSettings,
+              getEntryGroupSettings,
               listEntryGroupsSettings,
+              createEntrySettings,
+              updateEntrySettings,
               listEntriesSettings,
-              updateEntryGroupSettings,
               createTagTemplateSettings,
               getTagTemplateSettings,
               updateTagTemplateSettings,
-              deleteTagTemplateSettings,
               createTagTemplateFieldSettings,
               updateTagTemplateFieldSettings,
               renameTagTemplateFieldSettings,
-              deleteTagTemplateFieldSettings,
               createTagSettings,
               updateTagSettings,
-              deleteTagSettings,
               listTagsSettings,
               setIamPolicySettings,
-              getIamPolicySettings,
               testIamPermissionsSettings);
 
       initDefaults(this);
@@ -707,98 +824,108 @@ private static Builder initDefaults(Builder builder) {
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .createEntryGroupSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .deleteEntryGroupSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .getEntryGroupSettings()
+          .deleteEntrySettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteEntryGroupSettings()
+          .getEntrySettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .createEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .lookupEntrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .updateEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .deleteTagTemplateSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteEntrySettings()
+          .deleteTagTemplateFieldSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .getEntrySettings()
+          .deleteTagSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .lookupEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .getIamPolicySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .listEntryGroupsSettings()
+          .createEntryGroupSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .updateEntryGroupSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getEntryGroupSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .listEntriesSettings()
+          .listEntryGroupsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .updateEntryGroupSettings()
+          .createEntrySettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .createTagTemplateSettings()
+          .updateEntrySettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .getTagTemplateSettings()
+          .listEntriesSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .updateTagTemplateSettings()
+          .createTagTemplateSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteTagTemplateSettings()
+          .getTagTemplateSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .createTagTemplateFieldSettings()
+          .updateTagTemplateSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .updateTagTemplateFieldSettings()
+          .createTagTemplateFieldSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .renameTagTemplateFieldSettings()
+          .updateTagTemplateFieldSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteTagTemplateFieldSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .renameTagTemplateFieldSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
@@ -811,11 +938,6 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
-      builder
-          .deleteTagSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .listTagsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
@@ -826,11 +948,6 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
-      builder
-          .getIamPolicySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .testIamPermissionsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
@@ -843,61 +960,61 @@ protected Builder(DataCatalogStubSettings settings) {
       super(settings);
 
       searchCatalogSettings = settings.searchCatalogSettings.toBuilder();
-      createEntryGroupSettings = settings.createEntryGroupSettings.toBuilder();
-      getEntryGroupSettings = settings.getEntryGroupSettings.toBuilder();
       deleteEntryGroupSettings = settings.deleteEntryGroupSettings.toBuilder();
-      createEntrySettings = settings.createEntrySettings.toBuilder();
-      updateEntrySettings = settings.updateEntrySettings.toBuilder();
       deleteEntrySettings = settings.deleteEntrySettings.toBuilder();
       getEntrySettings = settings.getEntrySettings.toBuilder();
       lookupEntrySettings = settings.lookupEntrySettings.toBuilder();
+      deleteTagTemplateSettings = settings.deleteTagTemplateSettings.toBuilder();
+      deleteTagTemplateFieldSettings = settings.deleteTagTemplateFieldSettings.toBuilder();
+      deleteTagSettings = settings.deleteTagSettings.toBuilder();
+      getIamPolicySettings = settings.getIamPolicySettings.toBuilder();
+      createEntryGroupSettings = settings.createEntryGroupSettings.toBuilder();
+      updateEntryGroupSettings = settings.updateEntryGroupSettings.toBuilder();
+      getEntryGroupSettings = settings.getEntryGroupSettings.toBuilder();
       listEntryGroupsSettings = settings.listEntryGroupsSettings.toBuilder();
+      createEntrySettings = settings.createEntrySettings.toBuilder();
+      updateEntrySettings = settings.updateEntrySettings.toBuilder();
       listEntriesSettings = settings.listEntriesSettings.toBuilder();
-      updateEntryGroupSettings = settings.updateEntryGroupSettings.toBuilder();
       createTagTemplateSettings = settings.createTagTemplateSettings.toBuilder();
       getTagTemplateSettings = settings.getTagTemplateSettings.toBuilder();
       updateTagTemplateSettings = settings.updateTagTemplateSettings.toBuilder();
-      deleteTagTemplateSettings = settings.deleteTagTemplateSettings.toBuilder();
       createTagTemplateFieldSettings = settings.createTagTemplateFieldSettings.toBuilder();
       updateTagTemplateFieldSettings = settings.updateTagTemplateFieldSettings.toBuilder();
       renameTagTemplateFieldSettings = settings.renameTagTemplateFieldSettings.toBuilder();
-      deleteTagTemplateFieldSettings = settings.deleteTagTemplateFieldSettings.toBuilder();
       createTagSettings = settings.createTagSettings.toBuilder();
       updateTagSettings = settings.updateTagSettings.toBuilder();
-      deleteTagSettings = settings.deleteTagSettings.toBuilder();
       listTagsSettings = settings.listTagsSettings.toBuilder();
       setIamPolicySettings = settings.setIamPolicySettings.toBuilder();
-      getIamPolicySettings = settings.getIamPolicySettings.toBuilder();
       testIamPermissionsSettings = settings.testIamPermissionsSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
               searchCatalogSettings,
-              createEntryGroupSettings,
-              getEntryGroupSettings,
               deleteEntryGroupSettings,
-              createEntrySettings,
-              updateEntrySettings,
               deleteEntrySettings,
               getEntrySettings,
               lookupEntrySettings,
+              deleteTagTemplateSettings,
+              deleteTagTemplateFieldSettings,
+              deleteTagSettings,
+              getIamPolicySettings,
+              createEntryGroupSettings,
+              updateEntryGroupSettings,
+              getEntryGroupSettings,
               listEntryGroupsSettings,
+              createEntrySettings,
+              updateEntrySettings,
               listEntriesSettings,
-              updateEntryGroupSettings,
               createTagTemplateSettings,
               getTagTemplateSettings,
               updateTagTemplateSettings,
-              deleteTagTemplateSettings,
               createTagTemplateFieldSettings,
               updateTagTemplateFieldSettings,
               renameTagTemplateFieldSettings,
-              deleteTagTemplateFieldSettings,
               createTagSettings,
               updateTagSettings,
-              deleteTagSettings,
               listTagsSettings,
               setIamPolicySettings,
-              getIamPolicySettings,
               testIamPermissionsSettings);
     }
 
@@ -924,32 +1041,11 @@ public Builder applyToAllUnaryMethods(
       return searchCatalogSettings;
     }
 
-    /** Returns the builder for the settings used for calls to createEntryGroup. */
-    public UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
-        createEntryGroupSettings() {
-      return createEntryGroupSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to getEntryGroup. */
-    public UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
-      return getEntryGroupSettings;
-    }
-
     /** Returns the builder for the settings used for calls to deleteEntryGroup. */
     public UnaryCallSettings.Builder<DeleteEntryGroupRequest, Empty> deleteEntryGroupSettings() {
       return deleteEntryGroupSettings;
     }
 
-    /** Returns the builder for the settings used for calls to createEntry. */
-    public UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings() {
-      return createEntrySettings;
-    }
-
-    /** Returns the builder for the settings used for calls to updateEntry. */
-    public UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings() {
-      return updateEntrySettings;
-    }
-
     /** Returns the builder for the settings used for calls to deleteEntry. */
     public UnaryCallSettings.Builder<DeleteEntryRequest, Empty> deleteEntrySettings() {
       return deleteEntrySettings;
@@ -965,16 +1061,31 @@ public UnaryCallSettings.Builder<LookupEntryRequest, Entry> lookupEntrySettings(
       return lookupEntrySettings;
     }
 
-    /** Returns the builder for the settings used for calls to listEntryGroups. */
-    public UnaryCallSettings.Builder<ListEntryGroupsRequest, ListEntryGroupsResponse>
-        listEntryGroupsSettings() {
-      return listEntryGroupsSettings;
+    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
+    public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
+      return deleteTagTemplateSettings;
     }
 
-    /** Returns the builder for the settings used for calls to listEntries. */
-    public UnaryCallSettings.Builder<ListEntriesRequest, ListEntriesResponse>
-        listEntriesSettings() {
-      return listEntriesSettings;
+    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
+    public UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
+        deleteTagTemplateFieldSettings() {
+      return deleteTagTemplateFieldSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteTag. */
+    public UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings() {
+      return deleteTagSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings() {
+      return getIamPolicySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to createEntryGroup. */
+    public UnaryCallSettings.Builder<CreateEntryGroupRequest, EntryGroup>
+        createEntryGroupSettings() {
+      return createEntryGroupSettings;
     }
 
     /** Returns the builder for the settings used for calls to updateEntryGroup. */
@@ -983,6 +1094,35 @@ public UnaryCallSettings.Builder<LookupEntryRequest, Entry> lookupEntrySettings(
       return updateEntryGroupSettings;
     }
 
+    /** Returns the builder for the settings used for calls to getEntryGroup. */
+    public UnaryCallSettings.Builder<GetEntryGroupRequest, EntryGroup> getEntryGroupSettings() {
+      return getEntryGroupSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listEntryGroups. */
+    public PagedCallSettings.Builder<
+            ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
+        listEntryGroupsSettings() {
+      return listEntryGroupsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to createEntry. */
+    public UnaryCallSettings.Builder<CreateEntryRequest, Entry> createEntrySettings() {
+      return createEntrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to updateEntry. */
+    public UnaryCallSettings.Builder<UpdateEntryRequest, Entry> updateEntrySettings() {
+      return updateEntrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listEntries. */
+    public PagedCallSettings.Builder<
+            ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
+        listEntriesSettings() {
+      return listEntriesSettings;
+    }
+
     /** Returns the builder for the settings used for calls to createTagTemplate. */
     public UnaryCallSettings.Builder<CreateTagTemplateRequest, TagTemplate>
         createTagTemplateSettings() {
@@ -1000,11 +1140,6 @@ public UnaryCallSettings.Builder<GetTagTemplateRequest, TagTemplate> getTagTempl
       return updateTagTemplateSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
-    public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTemplateSettings() {
-      return deleteTagTemplateSettings;
-    }
-
     /** Returns the builder for the settings used for calls to createTagTemplateField. */
     public UnaryCallSettings.Builder<CreateTagTemplateFieldRequest, TagTemplateField>
         createTagTemplateFieldSettings() {
@@ -1023,12 +1158,6 @@ public UnaryCallSettings.Builder<DeleteTagTemplateRequest, Empty> deleteTagTempl
       return renameTagTemplateFieldSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
-    public UnaryCallSettings.Builder<DeleteTagTemplateFieldRequest, Empty>
-        deleteTagTemplateFieldSettings() {
-      return deleteTagTemplateFieldSettings;
-    }
-
     /** Returns the builder for the settings used for calls to createTag. */
     public UnaryCallSettings.Builder<CreateTagRequest, Tag> createTagSettings() {
       return createTagSettings;
@@ -1039,11 +1168,6 @@ public UnaryCallSettings.Builder<UpdateTagRequest, Tag> updateTagSettings() {
       return updateTagSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTag. */
-    public UnaryCallSettings.Builder<DeleteTagRequest, Empty> deleteTagSettings() {
-      return deleteTagSettings;
-    }
-
     /** Returns the builder for the settings used for calls to listTags. */
     public PagedCallSettings.Builder<ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
         listTagsSettings() {
@@ -1055,11 +1179,6 @@ public UnaryCallSettings.Builder<SetIamPolicyRequest, Policy> setIamPolicySettin
       return setIamPolicySettings;
     }
 
-    /** Returns the builder for the settings used for calls to getIamPolicy. */
-    public UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings() {
-      return getIamPolicySettings;
-    }
-
     /** Returns the builder for the settings used for calls to testIamPermissions. */
     public UnaryCallSettings.Builder<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsSettings() {
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcDataCatalogStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcDataCatalogStub.java
index 1375316a..93ab6ec5 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcDataCatalogStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcDataCatalogStub.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntriesPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntryGroupsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListTagsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.SearchCatalogPagedResponse;
 
@@ -93,24 +95,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(SearchCatalogResponse.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<CreateEntryGroupRequest, EntryGroup>
-      createEntryGroupMethodDescriptor =
-          MethodDescriptor.<CreateEntryGroupRequest, EntryGroup>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/CreateEntryGroup")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(CreateEntryGroupRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor<GetEntryGroupRequest, EntryGroup>
-      getEntryGroupMethodDescriptor =
-          MethodDescriptor.<GetEntryGroupRequest, EntryGroup>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/GetEntryGroup")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(GetEntryGroupRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor<DeleteEntryGroupRequest, Empty>
       deleteEntryGroupMethodDescriptor =
           MethodDescriptor.<DeleteEntryGroupRequest, Empty>newBuilder()
@@ -120,20 +104,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(DeleteEntryGroupRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<CreateEntryRequest, Entry> createEntryMethodDescriptor =
-      MethodDescriptor.<CreateEntryRequest, Entry>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/CreateEntry")
-          .setRequestMarshaller(ProtoUtils.marshaller(CreateEntryRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
-          .build();
-  private static final MethodDescriptor<UpdateEntryRequest, Entry> updateEntryMethodDescriptor =
-      MethodDescriptor.<UpdateEntryRequest, Entry>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/UpdateEntry")
-          .setRequestMarshaller(ProtoUtils.marshaller(UpdateEntryRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<DeleteEntryRequest, Empty> deleteEntryMethodDescriptor =
       MethodDescriptor.<DeleteEntryRequest, Empty>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -155,6 +125,66 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(LookupEntryRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
           .build();
+  private static final MethodDescriptor<DeleteTagTemplateRequest, Empty>
+      deleteTagTemplateMethodDescriptor =
+          MethodDescriptor.<DeleteTagTemplateRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTagTemplate")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteTagTemplateRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor<DeleteTagTemplateFieldRequest, Empty>
+      deleteTagTemplateFieldMethodDescriptor =
+          MethodDescriptor.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTagTemplateField")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteTagTemplateFieldRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor<DeleteTagRequest, Empty> deleteTagMethodDescriptor =
+      MethodDescriptor.<DeleteTagRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTag")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteTagRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor<GetIamPolicyRequest, Policy> getIamPolicyMethodDescriptor =
+      MethodDescriptor.<GetIamPolicyRequest, Policy>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/GetIamPolicy")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor<CreateEntryGroupRequest, EntryGroup>
+      createEntryGroupMethodDescriptor =
+          MethodDescriptor.<CreateEntryGroupRequest, EntryGroup>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/CreateEntryGroup")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(CreateEntryGroupRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor<UpdateEntryGroupRequest, EntryGroup>
+      updateEntryGroupMethodDescriptor =
+          MethodDescriptor.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/UpdateEntryGroup")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(UpdateEntryGroupRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor<GetEntryGroupRequest, EntryGroup>
+      getEntryGroupMethodDescriptor =
+          MethodDescriptor.<GetEntryGroupRequest, EntryGroup>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/GetEntryGroup")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(GetEntryGroupRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
+              .build();
   private static final MethodDescriptor<ListEntryGroupsRequest, ListEntryGroupsResponse>
       listEntryGroupsMethodDescriptor =
           MethodDescriptor.<ListEntryGroupsRequest, ListEntryGroupsResponse>newBuilder()
@@ -165,6 +195,20 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(ListEntryGroupsResponse.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<CreateEntryRequest, Entry> createEntryMethodDescriptor =
+      MethodDescriptor.<CreateEntryRequest, Entry>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/CreateEntry")
+          .setRequestMarshaller(ProtoUtils.marshaller(CreateEntryRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor<UpdateEntryRequest, Entry> updateEntryMethodDescriptor =
+      MethodDescriptor.<UpdateEntryRequest, Entry>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/UpdateEntry")
+          .setRequestMarshaller(ProtoUtils.marshaller(UpdateEntryRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<ListEntriesRequest, ListEntriesResponse>
       listEntriesMethodDescriptor =
           MethodDescriptor.<ListEntriesRequest, ListEntriesResponse>newBuilder()
@@ -174,15 +218,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(ListEntriesResponse.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<UpdateEntryGroupRequest, EntryGroup>
-      updateEntryGroupMethodDescriptor =
-          MethodDescriptor.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/UpdateEntryGroup")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(UpdateEntryGroupRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor<CreateTagTemplateRequest, TagTemplate>
       createTagTemplateMethodDescriptor =
           MethodDescriptor.<CreateTagTemplateRequest, TagTemplate>newBuilder()
@@ -210,15 +245,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(UpdateTagTemplateRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(TagTemplate.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<DeleteTagTemplateRequest, Empty>
-      deleteTagTemplateMethodDescriptor =
-          MethodDescriptor.<DeleteTagTemplateRequest, Empty>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTagTemplate")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteTagTemplateRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldMethodDescriptor =
           MethodDescriptor.<CreateTagTemplateFieldRequest, TagTemplateField>newBuilder()
@@ -249,16 +275,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(RenameTagTemplateFieldRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(TagTemplateField.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<DeleteTagTemplateFieldRequest, Empty>
-      deleteTagTemplateFieldMethodDescriptor =
-          MethodDescriptor.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(
-                  "google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTagTemplateField")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteTagTemplateFieldRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor<CreateTagRequest, Tag> createTagMethodDescriptor =
       MethodDescriptor.<CreateTagRequest, Tag>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -273,13 +289,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(UpdateTagRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Tag.getDefaultInstance()))
           .build();
-  private static final MethodDescriptor<DeleteTagRequest, Empty> deleteTagMethodDescriptor =
-      MethodDescriptor.<DeleteTagRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteTag")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteTagRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<ListTagsRequest, ListTagsResponse>
       listTagsMethodDescriptor =
           MethodDescriptor.<ListTagsRequest, ListTagsResponse>newBuilder()
@@ -295,13 +304,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
           .build();
-  private static final MethodDescriptor<GetIamPolicyRequest, Policy> getIamPolicyMethodDescriptor =
-      MethodDescriptor.<GetIamPolicyRequest, Policy>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/GetIamPolicy")
-          .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsMethodDescriptor =
           MethodDescriptor.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
@@ -318,36 +320,40 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
   private final UnaryCallable<SearchCatalogRequest, SearchCatalogResponse> searchCatalogCallable;
   private final UnaryCallable<SearchCatalogRequest, SearchCatalogPagedResponse>
       searchCatalogPagedCallable;
-  private final UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable;
-  private final UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable;
   private final UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCallable;
-  private final UnaryCallable<CreateEntryRequest, Entry> createEntryCallable;
-  private final UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable;
   private final UnaryCallable<DeleteEntryRequest, Empty> deleteEntryCallable;
   private final UnaryCallable<GetEntryRequest, Entry> getEntryCallable;
   private final UnaryCallable<LookupEntryRequest, Entry> lookupEntryCallable;
+  private final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable;
+  private final UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable;
+  private final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable;
+  private final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable;
+  private final UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable;
+  private final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable;
+  private final UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable;
   private final UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse>
       listEntryGroupsCallable;
+  private final UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsPagedResponse>
+      listEntryGroupsPagedCallable;
+  private final UnaryCallable<CreateEntryRequest, Entry> createEntryCallable;
+  private final UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable;
   private final UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable;
-  private final UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable;
+  private final UnaryCallable<ListEntriesRequest, ListEntriesPagedResponse>
+      listEntriesPagedCallable;
   private final UnaryCallable<CreateTagTemplateRequest, TagTemplate> createTagTemplateCallable;
   private final UnaryCallable<GetTagTemplateRequest, TagTemplate> getTagTemplateCallable;
   private final UnaryCallable<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateCallable;
-  private final UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable;
   private final UnaryCallable<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldCallable;
   private final UnaryCallable<UpdateTagTemplateFieldRequest, TagTemplateField>
       updateTagTemplateFieldCallable;
   private final UnaryCallable<RenameTagTemplateFieldRequest, TagTemplateField>
       renameTagTemplateFieldCallable;
-  private final UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable;
   private final UnaryCallable<CreateTagRequest, Tag> createTagCallable;
   private final UnaryCallable<UpdateTagRequest, Tag> updateTagCallable;
-  private final UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable;
   private final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable;
   private final UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPagedCallable;
   private final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable;
-  private final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable;
   private final UnaryCallable<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsCallable;
 
@@ -394,101 +400,141 @@ protected GrpcDataCatalogStub(
         GrpcCallSettings.<SearchCatalogRequest, SearchCatalogResponse>newBuilder()
             .setMethodDescriptor(searchCatalogMethodDescriptor)
             .build();
-    GrpcCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupTransportSettings =
-        GrpcCallSettings.<CreateEntryGroupRequest, EntryGroup>newBuilder()
-            .setMethodDescriptor(createEntryGroupMethodDescriptor)
+    GrpcCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupTransportSettings =
+        GrpcCallSettings.<DeleteEntryGroupRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryGroupRequest>() {
+                new RequestParamsExtractor<DeleteEntryGroupRequest>() {
                   @Override
-                  public Map<String, String> extract(CreateEntryGroupRequest request) {
+                  public Map<String, String> extract(DeleteEntryGroupRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
+                    params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupTransportSettings =
-        GrpcCallSettings.<GetEntryGroupRequest, EntryGroup>newBuilder()
-            .setMethodDescriptor(getEntryGroupMethodDescriptor)
+    GrpcCallSettings<DeleteEntryRequest, Empty> deleteEntryTransportSettings =
+        GrpcCallSettings.<DeleteEntryRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryGroupRequest>() {
+                new RequestParamsExtractor<DeleteEntryRequest>() {
                   @Override
-                  public Map<String, String> extract(GetEntryGroupRequest request) {
+                  public Map<String, String> extract(DeleteEntryRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
                     params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupTransportSettings =
-        GrpcCallSettings.<DeleteEntryGroupRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
+    GrpcCallSettings<GetEntryRequest, Entry> getEntryTransportSettings =
+        GrpcCallSettings.<GetEntryRequest, Entry>newBuilder()
+            .setMethodDescriptor(getEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryGroupRequest>() {
+                new RequestParamsExtractor<GetEntryRequest>() {
                   @Override
-                  public Map<String, String> extract(DeleteEntryGroupRequest request) {
+                  public Map<String, String> extract(GetEntryRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
                     params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<CreateEntryRequest, Entry> createEntryTransportSettings =
-        GrpcCallSettings.<CreateEntryRequest, Entry>newBuilder()
-            .setMethodDescriptor(createEntryMethodDescriptor)
+    GrpcCallSettings<LookupEntryRequest, Entry> lookupEntryTransportSettings =
+        GrpcCallSettings.<LookupEntryRequest, Entry>newBuilder()
+            .setMethodDescriptor(lookupEntryMethodDescriptor)
+            .build();
+    GrpcCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateTransportSettings =
+        GrpcCallSettings.<DeleteTagTemplateRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryRequest>() {
+                new RequestParamsExtractor<DeleteTagTemplateRequest>() {
                   @Override
-                  public Map<String, String> extract(CreateEntryRequest request) {
+                  public Map<String, String> extract(DeleteTagTemplateRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
+                    params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<UpdateEntryRequest, Entry> updateEntryTransportSettings =
-        GrpcCallSettings.<UpdateEntryRequest, Entry>newBuilder()
-            .setMethodDescriptor(updateEntryMethodDescriptor)
+    GrpcCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldTransportSettings =
+        GrpcCallSettings.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryRequest>() {
+                new RequestParamsExtractor<DeleteTagTemplateFieldRequest>() {
                   @Override
-                  public Map<String, String> extract(UpdateEntryRequest request) {
+                  public Map<String, String> extract(DeleteTagTemplateFieldRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("entry.name", String.valueOf(request.getEntry().getName()));
+                    params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<DeleteEntryRequest, Empty> deleteEntryTransportSettings =
-        GrpcCallSettings.<DeleteEntryRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteEntryMethodDescriptor)
+    GrpcCallSettings<DeleteTagRequest, Empty> deleteTagTransportSettings =
+        GrpcCallSettings.<DeleteTagRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteTagMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteTagRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteTagRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
+        GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
+            .setMethodDescriptor(getIamPolicyMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<GetIamPolicyRequest>() {
+                  @Override
+                  public Map<String, String> extract(GetIamPolicyRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("resource", String.valueOf(request.getResource()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<CreateEntryGroupRequest, EntryGroup> createEntryGroupTransportSettings =
+        GrpcCallSettings.<CreateEntryGroupRequest, EntryGroup>newBuilder()
+            .setMethodDescriptor(createEntryGroupMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<CreateEntryGroupRequest>() {
+                  @Override
+                  public Map<String, String> extract(CreateEntryGroupRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupTransportSettings =
+        GrpcCallSettings.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
+            .setMethodDescriptor(updateEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryRequest>() {
+                new RequestParamsExtractor<UpdateEntryGroupRequest>() {
                   @Override
-                  public Map<String, String> extract(DeleteEntryRequest request) {
+                  public Map<String, String> extract(UpdateEntryGroupRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
+                    params.put(
+                        "entry_group.name", String.valueOf(request.getEntryGroup().getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<GetEntryRequest, Entry> getEntryTransportSettings =
-        GrpcCallSettings.<GetEntryRequest, Entry>newBuilder()
-            .setMethodDescriptor(getEntryMethodDescriptor)
+    GrpcCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupTransportSettings =
+        GrpcCallSettings.<GetEntryGroupRequest, EntryGroup>newBuilder()
+            .setMethodDescriptor(getEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryRequest>() {
+                new RequestParamsExtractor<GetEntryGroupRequest>() {
                   @Override
-                  public Map<String, String> extract(GetEntryRequest request) {
+                  public Map<String, String> extract(GetEntryGroupRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
                     params.put("name", String.valueOf(request.getName()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<LookupEntryRequest, Entry> lookupEntryTransportSettings =
-        GrpcCallSettings.<LookupEntryRequest, Entry>newBuilder()
-            .setMethodDescriptor(lookupEntryMethodDescriptor)
-            .build();
     GrpcCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
         listEntryGroupsTransportSettings =
             GrpcCallSettings.<ListEntryGroupsRequest, ListEntryGroupsResponse>newBuilder()
@@ -503,29 +549,41 @@ public Map<String, String> extract(ListEntryGroupsRequest request) {
                       }
                     })
                 .build();
-    GrpcCallSettings<ListEntriesRequest, ListEntriesResponse> listEntriesTransportSettings =
-        GrpcCallSettings.<ListEntriesRequest, ListEntriesResponse>newBuilder()
-            .setMethodDescriptor(listEntriesMethodDescriptor)
+    GrpcCallSettings<CreateEntryRequest, Entry> createEntryTransportSettings =
+        GrpcCallSettings.<CreateEntryRequest, Entry>newBuilder()
+            .setMethodDescriptor(createEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListEntriesRequest>() {
+                new RequestParamsExtractor<CreateEntryRequest>() {
                   @Override
-                  public Map<String, String> extract(ListEntriesRequest request) {
+                  public Map<String, String> extract(CreateEntryRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
                     params.put("parent", String.valueOf(request.getParent()));
                     return params.build();
                   }
                 })
             .build();
-    GrpcCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupTransportSettings =
-        GrpcCallSettings.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
-            .setMethodDescriptor(updateEntryGroupMethodDescriptor)
+    GrpcCallSettings<UpdateEntryRequest, Entry> updateEntryTransportSettings =
+        GrpcCallSettings.<UpdateEntryRequest, Entry>newBuilder()
+            .setMethodDescriptor(updateEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryGroupRequest>() {
+                new RequestParamsExtractor<UpdateEntryRequest>() {
                   @Override
-                  public Map<String, String> extract(UpdateEntryGroupRequest request) {
+                  public Map<String, String> extract(UpdateEntryRequest request) {
                     ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "entry_group.name", String.valueOf(request.getEntryGroup().getName()));
+                    params.put("entry.name", String.valueOf(request.getEntry().getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<ListEntriesRequest, ListEntriesResponse> listEntriesTransportSettings =
+        GrpcCallSettings.<ListEntriesRequest, ListEntriesResponse>newBuilder()
+            .setMethodDescriptor(listEntriesMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<ListEntriesRequest>() {
+                  @Override
+                  public Map<String, String> extract(ListEntriesRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
                     return params.build();
                   }
                 })
@@ -570,19 +628,6 @@ public Map<String, String> extract(UpdateTagTemplateRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateTransportSettings =
-        GrpcCallSettings.<DeleteTagTemplateRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
         createTagTemplateFieldTransportSettings =
             GrpcCallSettings.<CreateTagTemplateFieldRequest, TagTemplateField>newBuilder()
@@ -625,19 +670,6 @@ public Map<String, String> extract(RenameTagTemplateFieldRequest request) {
                       }
                     })
                 .build();
-    GrpcCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldTransportSettings =
-        GrpcCallSettings.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateFieldRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateFieldRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateTagRequest, Tag> createTagTransportSettings =
         GrpcCallSettings.<CreateTagRequest, Tag>newBuilder()
             .setMethodDescriptor(createTagMethodDescriptor)
@@ -664,19 +696,6 @@ public Map<String, String> extract(UpdateTagRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<DeleteTagRequest, Empty> deleteTagTransportSettings =
-        GrpcCallSettings.<DeleteTagRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteTagMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<ListTagsRequest, ListTagsResponse> listTagsTransportSettings =
         GrpcCallSettings.<ListTagsRequest, ListTagsResponse>newBuilder()
             .setMethodDescriptor(listTagsMethodDescriptor)
@@ -703,19 +722,6 @@ public Map<String, String> extract(SetIamPolicyRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
-        GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
-            .setMethodDescriptor(getIamPolicyMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsTransportSettings =
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
@@ -737,21 +743,9 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
     this.searchCatalogPagedCallable =
         callableFactory.createPagedCallable(
             searchCatalogTransportSettings, settings.searchCatalogSettings(), clientContext);
-    this.createEntryGroupCallable =
-        callableFactory.createUnaryCallable(
-            createEntryGroupTransportSettings, settings.createEntryGroupSettings(), clientContext);
-    this.getEntryGroupCallable =
-        callableFactory.createUnaryCallable(
-            getEntryGroupTransportSettings, settings.getEntryGroupSettings(), clientContext);
     this.deleteEntryGroupCallable =
         callableFactory.createUnaryCallable(
             deleteEntryGroupTransportSettings, settings.deleteEntryGroupSettings(), clientContext);
-    this.createEntryCallable =
-        callableFactory.createUnaryCallable(
-            createEntryTransportSettings, settings.createEntrySettings(), clientContext);
-    this.updateEntryCallable =
-        callableFactory.createUnaryCallable(
-            updateEntryTransportSettings, settings.updateEntrySettings(), clientContext);
     this.deleteEntryCallable =
         callableFactory.createUnaryCallable(
             deleteEntryTransportSettings, settings.deleteEntrySettings(), clientContext);
@@ -761,15 +755,49 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
     this.lookupEntryCallable =
         callableFactory.createUnaryCallable(
             lookupEntryTransportSettings, settings.lookupEntrySettings(), clientContext);
+    this.deleteTagTemplateCallable =
+        callableFactory.createUnaryCallable(
+            deleteTagTemplateTransportSettings,
+            settings.deleteTagTemplateSettings(),
+            clientContext);
+    this.deleteTagTemplateFieldCallable =
+        callableFactory.createUnaryCallable(
+            deleteTagTemplateFieldTransportSettings,
+            settings.deleteTagTemplateFieldSettings(),
+            clientContext);
+    this.deleteTagCallable =
+        callableFactory.createUnaryCallable(
+            deleteTagTransportSettings, settings.deleteTagSettings(), clientContext);
+    this.getIamPolicyCallable =
+        callableFactory.createUnaryCallable(
+            getIamPolicyTransportSettings, settings.getIamPolicySettings(), clientContext);
+    this.createEntryGroupCallable =
+        callableFactory.createUnaryCallable(
+            createEntryGroupTransportSettings, settings.createEntryGroupSettings(), clientContext);
+    this.updateEntryGroupCallable =
+        callableFactory.createUnaryCallable(
+            updateEntryGroupTransportSettings, settings.updateEntryGroupSettings(), clientContext);
+    this.getEntryGroupCallable =
+        callableFactory.createUnaryCallable(
+            getEntryGroupTransportSettings, settings.getEntryGroupSettings(), clientContext);
     this.listEntryGroupsCallable =
         callableFactory.createUnaryCallable(
             listEntryGroupsTransportSettings, settings.listEntryGroupsSettings(), clientContext);
+    this.listEntryGroupsPagedCallable =
+        callableFactory.createPagedCallable(
+            listEntryGroupsTransportSettings, settings.listEntryGroupsSettings(), clientContext);
+    this.createEntryCallable =
+        callableFactory.createUnaryCallable(
+            createEntryTransportSettings, settings.createEntrySettings(), clientContext);
+    this.updateEntryCallable =
+        callableFactory.createUnaryCallable(
+            updateEntryTransportSettings, settings.updateEntrySettings(), clientContext);
     this.listEntriesCallable =
         callableFactory.createUnaryCallable(
             listEntriesTransportSettings, settings.listEntriesSettings(), clientContext);
-    this.updateEntryGroupCallable =
-        callableFactory.createUnaryCallable(
-            updateEntryGroupTransportSettings, settings.updateEntryGroupSettings(), clientContext);
+    this.listEntriesPagedCallable =
+        callableFactory.createPagedCallable(
+            listEntriesTransportSettings, settings.listEntriesSettings(), clientContext);
     this.createTagTemplateCallable =
         callableFactory.createUnaryCallable(
             createTagTemplateTransportSettings,
@@ -783,11 +811,6 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
             updateTagTemplateTransportSettings,
             settings.updateTagTemplateSettings(),
             clientContext);
-    this.deleteTagTemplateCallable =
-        callableFactory.createUnaryCallable(
-            deleteTagTemplateTransportSettings,
-            settings.deleteTagTemplateSettings(),
-            clientContext);
     this.createTagTemplateFieldCallable =
         callableFactory.createUnaryCallable(
             createTagTemplateFieldTransportSettings,
@@ -803,20 +826,12 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
             renameTagTemplateFieldTransportSettings,
             settings.renameTagTemplateFieldSettings(),
             clientContext);
-    this.deleteTagTemplateFieldCallable =
-        callableFactory.createUnaryCallable(
-            deleteTagTemplateFieldTransportSettings,
-            settings.deleteTagTemplateFieldSettings(),
-            clientContext);
     this.createTagCallable =
         callableFactory.createUnaryCallable(
             createTagTransportSettings, settings.createTagSettings(), clientContext);
     this.updateTagCallable =
         callableFactory.createUnaryCallable(
             updateTagTransportSettings, settings.updateTagSettings(), clientContext);
-    this.deleteTagCallable =
-        callableFactory.createUnaryCallable(
-            deleteTagTransportSettings, settings.deleteTagSettings(), clientContext);
     this.listTagsCallable =
         callableFactory.createUnaryCallable(
             listTagsTransportSettings, settings.listTagsSettings(), clientContext);
@@ -826,9 +841,6 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
     this.setIamPolicyCallable =
         callableFactory.createUnaryCallable(
             setIamPolicyTransportSettings, settings.setIamPolicySettings(), clientContext);
-    this.getIamPolicyCallable =
-        callableFactory.createUnaryCallable(
-            getIamPolicyTransportSettings, settings.getIamPolicySettings(), clientContext);
     this.testIamPermissionsCallable =
         callableFactory.createUnaryCallable(
             testIamPermissionsTransportSettings,
@@ -847,26 +859,10 @@ public UnaryCallable<SearchCatalogRequest, SearchCatalogResponse> searchCatalogC
     return searchCatalogCallable;
   }
 
-  public UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
-    return createEntryGroupCallable;
-  }
-
-  public UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
-    return getEntryGroupCallable;
-  }
-
   public UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCallable() {
     return deleteEntryGroupCallable;
   }
 
-  public UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
-    return createEntryCallable;
-  }
-
-  public UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
-    return updateEntryCallable;
-  }
-
   public UnaryCallable<DeleteEntryRequest, Empty> deleteEntryCallable() {
     return deleteEntryCallable;
   }
@@ -879,18 +875,59 @@ public UnaryCallable<LookupEntryRequest, Entry> lookupEntryCallable() {
     return lookupEntryCallable;
   }
 
-  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse> listEntryGroupsCallable() {
-    return listEntryGroupsCallable;
+  public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
+    return deleteTagTemplateCallable;
   }
 
-  public UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
-    return listEntriesCallable;
+  public UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable() {
+    return deleteTagTemplateFieldCallable;
+  }
+
+  public UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
+    return deleteTagCallable;
+  }
+
+  public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
+    return getIamPolicyCallable;
+  }
+
+  public UnaryCallable<CreateEntryGroupRequest, EntryGroup> createEntryGroupCallable() {
+    return createEntryGroupCallable;
   }
 
   public UnaryCallable<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupCallable() {
     return updateEntryGroupCallable;
   }
 
+  public UnaryCallable<GetEntryGroupRequest, EntryGroup> getEntryGroupCallable() {
+    return getEntryGroupCallable;
+  }
+
+  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsPagedResponse>
+      listEntryGroupsPagedCallable() {
+    return listEntryGroupsPagedCallable;
+  }
+
+  public UnaryCallable<ListEntryGroupsRequest, ListEntryGroupsResponse> listEntryGroupsCallable() {
+    return listEntryGroupsCallable;
+  }
+
+  public UnaryCallable<CreateEntryRequest, Entry> createEntryCallable() {
+    return createEntryCallable;
+  }
+
+  public UnaryCallable<UpdateEntryRequest, Entry> updateEntryCallable() {
+    return updateEntryCallable;
+  }
+
+  public UnaryCallable<ListEntriesRequest, ListEntriesPagedResponse> listEntriesPagedCallable() {
+    return listEntriesPagedCallable;
+  }
+
+  public UnaryCallable<ListEntriesRequest, ListEntriesResponse> listEntriesCallable() {
+    return listEntriesCallable;
+  }
+
   public UnaryCallable<CreateTagTemplateRequest, TagTemplate> createTagTemplateCallable() {
     return createTagTemplateCallable;
   }
@@ -903,10 +940,6 @@ public UnaryCallable<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateCal
     return updateTagTemplateCallable;
   }
 
-  public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable() {
-    return deleteTagTemplateCallable;
-  }
-
   public UnaryCallable<CreateTagTemplateFieldRequest, TagTemplateField>
       createTagTemplateFieldCallable() {
     return createTagTemplateFieldCallable;
@@ -922,10 +955,6 @@ public UnaryCallable<DeleteTagTemplateRequest, Empty> deleteTagTemplateCallable(
     return renameTagTemplateFieldCallable;
   }
 
-  public UnaryCallable<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldCallable() {
-    return deleteTagTemplateFieldCallable;
-  }
-
   public UnaryCallable<CreateTagRequest, Tag> createTagCallable() {
     return createTagCallable;
   }
@@ -934,10 +963,6 @@ public UnaryCallable<UpdateTagRequest, Tag> updateTagCallable() {
     return updateTagCallable;
   }
 
-  public UnaryCallable<DeleteTagRequest, Empty> deleteTagCallable() {
-    return deleteTagCallable;
-  }
-
   public UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPagedCallable() {
     return listTagsPagedCallable;
   }
@@ -950,10 +975,6 @@ public UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
     return setIamPolicyCallable;
   }
 
-  public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
-    return getIamPolicyCallable;
-  }
-
   public UnaryCallable<TestIamPermissionsRequest, TestIamPermissionsResponse>
       testIamPermissionsCallable() {
     return testIamPermissionsCallable;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
index 8a90134e..5e4ec863 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
@@ -15,6 +15,9 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListPolicyTagsPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListTaxonomiesPagedResponse;
+
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -185,11 +188,15 @@ public class GrpcPolicyTagManagerStub extends PolicyTagManagerStub {
   private final UnaryCallable<DeleteTaxonomyRequest, Empty> deleteTaxonomyCallable;
   private final UnaryCallable<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyCallable;
   private final UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesResponse> listTaxonomiesCallable;
+  private final UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesPagedResponse>
+      listTaxonomiesPagedCallable;
   private final UnaryCallable<GetTaxonomyRequest, Taxonomy> getTaxonomyCallable;
   private final UnaryCallable<CreatePolicyTagRequest, PolicyTag> createPolicyTagCallable;
   private final UnaryCallable<DeletePolicyTagRequest, Empty> deletePolicyTagCallable;
   private final UnaryCallable<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagCallable;
   private final UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsResponse> listPolicyTagsCallable;
+  private final UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsPagedResponse>
+      listPolicyTagsPagedCallable;
   private final UnaryCallable<GetPolicyTagRequest, PolicyTag> getPolicyTagCallable;
   private final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable;
   private final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable;
@@ -422,6 +429,9 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
     this.listTaxonomiesCallable =
         callableFactory.createUnaryCallable(
             listTaxonomiesTransportSettings, settings.listTaxonomiesSettings(), clientContext);
+    this.listTaxonomiesPagedCallable =
+        callableFactory.createPagedCallable(
+            listTaxonomiesTransportSettings, settings.listTaxonomiesSettings(), clientContext);
     this.getTaxonomyCallable =
         callableFactory.createUnaryCallable(
             getTaxonomyTransportSettings, settings.getTaxonomySettings(), clientContext);
@@ -437,6 +447,9 @@ public Map<String, String> extract(TestIamPermissionsRequest request) {
     this.listPolicyTagsCallable =
         callableFactory.createUnaryCallable(
             listPolicyTagsTransportSettings, settings.listPolicyTagsSettings(), clientContext);
+    this.listPolicyTagsPagedCallable =
+        callableFactory.createPagedCallable(
+            listPolicyTagsTransportSettings, settings.listPolicyTagsSettings(), clientContext);
     this.getPolicyTagCallable =
         callableFactory.createUnaryCallable(
             getPolicyTagTransportSettings, settings.getPolicyTagSettings(), clientContext);
@@ -467,6 +480,11 @@ public UnaryCallable<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyCallable() {
     return updateTaxonomyCallable;
   }
 
+  public UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesPagedResponse>
+      listTaxonomiesPagedCallable() {
+    return listTaxonomiesPagedCallable;
+  }
+
   public UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesResponse> listTaxonomiesCallable() {
     return listTaxonomiesCallable;
   }
@@ -487,6 +505,11 @@ public UnaryCallable<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagCallable(
     return updatePolicyTagCallable;
   }
 
+  public UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsPagedResponse>
+      listPolicyTagsPagedCallable() {
+    return listPolicyTagsPagedCallable;
+  }
+
   public UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsResponse> listPolicyTagsCallable() {
     return listPolicyTagsCallable;
   }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStub.java
index 260a1f08..45714aa2 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStub.java
@@ -15,6 +15,9 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListPolicyTagsPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListTaxonomiesPagedResponse;
+
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.rpc.UnaryCallable;
@@ -62,6 +65,11 @@ public UnaryCallable<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyCallable() {
     throw new UnsupportedOperationException("Not implemented: updateTaxonomyCallable()");
   }
 
+  public UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesPagedResponse>
+      listTaxonomiesPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listTaxonomiesPagedCallable()");
+  }
+
   public UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesResponse> listTaxonomiesCallable() {
     throw new UnsupportedOperationException("Not implemented: listTaxonomiesCallable()");
   }
@@ -82,6 +90,11 @@ public UnaryCallable<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagCallable(
     throw new UnsupportedOperationException("Not implemented: updatePolicyTagCallable()");
   }
 
+  public UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsPagedResponse>
+      listPolicyTagsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listPolicyTagsPagedCallable()");
+  }
+
   public UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsResponse> listPolicyTagsCallable() {
     throw new UnsupportedOperationException("Not implemented: listPolicyTagsCallable()");
   }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStubSettings.java
index 327d196f..1053bf62 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStubSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStubSettings.java
@@ -15,7 +15,11 @@
  */
 package com.google.cloud.datacatalog.v1beta1.stub;
 
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListPolicyTagsPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListTaxonomiesPagedResponse;
+
 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;
@@ -24,12 +28,18 @@
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 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.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.cloud.datacatalog.v1beta1.CreatePolicyTagRequest;
 import com.google.cloud.datacatalog.v1beta1.CreateTaxonomyRequest;
 import com.google.cloud.datacatalog.v1beta1.DeletePolicyTagRequest;
@@ -100,13 +110,15 @@ public class PolicyTagManagerStubSettings extends StubSettings<PolicyTagManagerS
   private final UnaryCallSettings<CreateTaxonomyRequest, Taxonomy> createTaxonomySettings;
   private final UnaryCallSettings<DeleteTaxonomyRequest, Empty> deleteTaxonomySettings;
   private final UnaryCallSettings<UpdateTaxonomyRequest, Taxonomy> updateTaxonomySettings;
-  private final UnaryCallSettings<ListTaxonomiesRequest, ListTaxonomiesResponse>
+  private final PagedCallSettings<
+          ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
       listTaxonomiesSettings;
   private final UnaryCallSettings<GetTaxonomyRequest, Taxonomy> getTaxonomySettings;
   private final UnaryCallSettings<CreatePolicyTagRequest, PolicyTag> createPolicyTagSettings;
   private final UnaryCallSettings<DeletePolicyTagRequest, Empty> deletePolicyTagSettings;
   private final UnaryCallSettings<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagSettings;
-  private final UnaryCallSettings<ListPolicyTagsRequest, ListPolicyTagsResponse>
+  private final PagedCallSettings<
+          ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
       listPolicyTagsSettings;
   private final UnaryCallSettings<GetPolicyTagRequest, PolicyTag> getPolicyTagSettings;
   private final UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -130,7 +142,9 @@ public UnaryCallSettings<UpdateTaxonomyRequest, Taxonomy> updateTaxonomySettings
   }
 
   /** Returns the object with the settings used for calls to listTaxonomies. */
-  public UnaryCallSettings<ListTaxonomiesRequest, ListTaxonomiesResponse> listTaxonomiesSettings() {
+  public PagedCallSettings<
+          ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
+      listTaxonomiesSettings() {
     return listTaxonomiesSettings;
   }
 
@@ -155,7 +169,9 @@ public UnaryCallSettings<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagSetti
   }
 
   /** Returns the object with the settings used for calls to listPolicyTags. */
-  public UnaryCallSettings<ListPolicyTagsRequest, ListPolicyTagsResponse> listPolicyTagsSettings() {
+  public PagedCallSettings<
+          ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
+      listPolicyTagsSettings() {
     return listPolicyTagsSettings;
   }
 
@@ -264,6 +280,114 @@ protected PolicyTagManagerStubSettings(Builder settingsBuilder) throws IOExcepti
     testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
   }
 
+  private static final PagedListDescriptor<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy>
+      LIST_TAXONOMIES_PAGE_STR_DESC =
+          new PagedListDescriptor<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListTaxonomiesRequest injectToken(ListTaxonomiesRequest payload, String token) {
+              return ListTaxonomiesRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListTaxonomiesRequest injectPageSize(
+                ListTaxonomiesRequest payload, int pageSize) {
+              return ListTaxonomiesRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListTaxonomiesRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListTaxonomiesResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable<Taxonomy> extractResources(ListTaxonomiesResponse payload) {
+              return payload.getTaxonomiesList() != null
+                  ? payload.getTaxonomiesList()
+                  : ImmutableList.<Taxonomy>of();
+            }
+          };
+
+  private static final PagedListDescriptor<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag>
+      LIST_POLICY_TAGS_PAGE_STR_DESC =
+          new PagedListDescriptor<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListPolicyTagsRequest injectToken(ListPolicyTagsRequest payload, String token) {
+              return ListPolicyTagsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListPolicyTagsRequest injectPageSize(
+                ListPolicyTagsRequest payload, int pageSize) {
+              return ListPolicyTagsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListPolicyTagsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListPolicyTagsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable<PolicyTag> extractResources(ListPolicyTagsResponse payload) {
+              return payload.getPolicyTagsList() != null
+                  ? payload.getPolicyTagsList()
+                  : ImmutableList.<PolicyTag>of();
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
+      LIST_TAXONOMIES_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>() {
+            @Override
+            public ApiFuture<ListTaxonomiesPagedResponse> getFuturePagedResponse(
+                UnaryCallable<ListTaxonomiesRequest, ListTaxonomiesResponse> callable,
+                ListTaxonomiesRequest request,
+                ApiCallContext context,
+                ApiFuture<ListTaxonomiesResponse> futureResponse) {
+              PageContext<ListTaxonomiesRequest, ListTaxonomiesResponse, Taxonomy> pageContext =
+                  PageContext.create(callable, LIST_TAXONOMIES_PAGE_STR_DESC, request, context);
+              return ListTaxonomiesPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
+      LIST_POLICY_TAGS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>() {
+            @Override
+            public ApiFuture<ListPolicyTagsPagedResponse> getFuturePagedResponse(
+                UnaryCallable<ListPolicyTagsRequest, ListPolicyTagsResponse> callable,
+                ListPolicyTagsRequest request,
+                ApiCallContext context,
+                ApiFuture<ListPolicyTagsResponse> futureResponse) {
+              PageContext<ListPolicyTagsRequest, ListPolicyTagsResponse, PolicyTag> pageContext =
+                  PageContext.create(callable, LIST_POLICY_TAGS_PAGE_STR_DESC, request, context);
+              return ListPolicyTagsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
   /** Builder for PolicyTagManagerStubSettings. */
   public static class Builder extends StubSettings.Builder<PolicyTagManagerStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
@@ -271,7 +395,8 @@ public static class Builder extends StubSettings.Builder<PolicyTagManagerStubSet
     private final UnaryCallSettings.Builder<CreateTaxonomyRequest, Taxonomy> createTaxonomySettings;
     private final UnaryCallSettings.Builder<DeleteTaxonomyRequest, Empty> deleteTaxonomySettings;
     private final UnaryCallSettings.Builder<UpdateTaxonomyRequest, Taxonomy> updateTaxonomySettings;
-    private final UnaryCallSettings.Builder<ListTaxonomiesRequest, ListTaxonomiesResponse>
+    private final PagedCallSettings.Builder<
+            ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
         listTaxonomiesSettings;
     private final UnaryCallSettings.Builder<GetTaxonomyRequest, Taxonomy> getTaxonomySettings;
     private final UnaryCallSettings.Builder<CreatePolicyTagRequest, PolicyTag>
@@ -279,7 +404,8 @@ public static class Builder extends StubSettings.Builder<PolicyTagManagerStubSet
     private final UnaryCallSettings.Builder<DeletePolicyTagRequest, Empty> deletePolicyTagSettings;
     private final UnaryCallSettings.Builder<UpdatePolicyTagRequest, PolicyTag>
         updatePolicyTagSettings;
-    private final UnaryCallSettings.Builder<ListPolicyTagsRequest, ListPolicyTagsResponse>
+    private final PagedCallSettings.Builder<
+            ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
         listPolicyTagsSettings;
     private final UnaryCallSettings.Builder<GetPolicyTagRequest, PolicyTag> getPolicyTagSettings;
     private final UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -334,7 +460,7 @@ protected Builder(ClientContext clientContext) {
 
       updateTaxonomySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      listTaxonomiesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      listTaxonomiesSettings = PagedCallSettings.newBuilder(LIST_TAXONOMIES_PAGE_STR_FACT);
 
       getTaxonomySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
@@ -344,7 +470,7 @@ protected Builder(ClientContext clientContext) {
 
       updatePolicyTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      listPolicyTagsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      listPolicyTagsSettings = PagedCallSettings.newBuilder(LIST_POLICY_TAGS_PAGE_STR_FACT);
 
       getPolicyTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
@@ -518,7 +644,8 @@ public UnaryCallSettings.Builder<UpdateTaxonomyRequest, Taxonomy> updateTaxonomy
     }
 
     /** Returns the builder for the settings used for calls to listTaxonomies. */
-    public UnaryCallSettings.Builder<ListTaxonomiesRequest, ListTaxonomiesResponse>
+    public PagedCallSettings.Builder<
+            ListTaxonomiesRequest, ListTaxonomiesResponse, ListTaxonomiesPagedResponse>
         listTaxonomiesSettings() {
       return listTaxonomiesSettings;
     }
@@ -544,7 +671,8 @@ public UnaryCallSettings.Builder<UpdatePolicyTagRequest, PolicyTag> updatePolicy
     }
 
     /** Returns the builder for the settings used for calls to listPolicyTags. */
-    public UnaryCallSettings.Builder<ListPolicyTagsRequest, ListPolicyTagsResponse>
+    public PagedCallSettings.Builder<
+            ListPolicyTagsRequest, ListPolicyTagsResponse, ListPolicyTagsPagedResponse>
         listPolicyTagsSettings() {
       return listPolicyTagsSettings;
     }
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
index e2656aaa..8eac940a 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
@@ -1534,10 +1534,8 @@ public void setIamPolicyTest() {
 
     ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
     Policy policy = Policy.newBuilder().build();
-    SetIamPolicyRequest request =
-        SetIamPolicyRequest.newBuilder().setResource(resource.toString()).setPolicy(policy).build();
 
-    Policy actualResponse = client.setIamPolicy(request);
+    Policy actualResponse = client.setIamPolicy(resource, policy);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -1561,13 +1559,8 @@ public void setIamPolicyExceptionTest() throws Exception {
     try {
       ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
       Policy policy = Policy.newBuilder().build();
-      SetIamPolicyRequest request =
-          SetIamPolicyRequest.newBuilder()
-              .setResource(resource.toString())
-              .setPolicy(policy)
-              .build();
 
-      client.setIamPolicy(request);
+      client.setIamPolicy(resource, policy);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1583,10 +1576,8 @@ public void getIamPolicyTest() {
     mockDataCatalog.addResponse(expectedResponse);
 
     ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-    GetIamPolicyRequest request =
-        GetIamPolicyRequest.newBuilder().setResource(resource.toString()).build();
 
-    Policy actualResponse = client.getIamPolicy(request);
+    Policy actualResponse = client.getIamPolicy(resource);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -1608,10 +1599,8 @@ public void getIamPolicyExceptionTest() throws Exception {
 
     try {
       ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-      GetIamPolicyRequest request =
-          GetIamPolicyRequest.newBuilder().setResource(resource.toString()).build();
 
-      client.getIamPolicy(request);
+      client.getIamPolicy(resource);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
index d68eee2e..a7c8474f 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.cloud.datacatalog.v1beta1;
 
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntriesPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListEntryGroupsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.ListTagsPagedResponse;
 import static com.google.cloud.datacatalog.v1beta1.DataCatalogClient.SearchCatalogPagedResponse;
 
@@ -25,6 +27,7 @@
 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.resourcenames.ResourceName;
 import com.google.common.collect.Lists;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;
@@ -41,6 +44,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -108,9 +112,8 @@ public void searchCatalogTest() {
 
     SearchCatalogRequest.Scope scope = SearchCatalogRequest.Scope.newBuilder().build();
     String query = "query107944136";
-    String orderBy = "orderBy1234304744";
 
-    SearchCatalogPagedResponse pagedListResponse = client.searchCatalog(scope, query, orderBy);
+    SearchCatalogPagedResponse pagedListResponse = client.searchCatalog(scope, query);
 
     List<SearchCatalogResult> resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
@@ -122,7 +125,6 @@ public void searchCatalogTest() {
 
     Assert.assertEquals(scope, actualRequest.getScope());
     Assert.assertEquals(query, actualRequest.getQuery());
-    Assert.assertEquals(orderBy, actualRequest.getOrderBy());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -138,9 +140,8 @@ public void searchCatalogExceptionTest() throws Exception {
     try {
       SearchCatalogRequest.Scope scope = SearchCatalogRequest.Scope.newBuilder().build();
       String query = "query107944136";
-      String orderBy = "orderBy1234304744";
 
-      client.searchCatalog(scope, query, orderBy);
+      client.searchCatalog(scope, query);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -149,32 +150,108 @@ public void searchCatalogExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void createEntryGroupTest() {
-    String name = "name3373707";
+  public void deleteEntryGroupTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+
+    client.deleteEntryGroup(name);
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteEntryGroupRequest actualRequest = (DeleteEntryGroupRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, EntryGroupName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteEntryGroupExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+
+      client.deleteEntryGroup(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteEntryTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+    client.deleteEntry(name);
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteEntryRequest actualRequest = (DeleteEntryRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, EntryName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteEntryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+      client.deleteEntry(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getEntryTest() {
+    EntryName name2 = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    String linkedResource = "linkedResource1544625012";
+    String userSpecifiedType = "userSpecifiedType-940364963";
+    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    EntryGroup expectedResponse =
-        EntryGroup.newBuilder()
-            .setName(name)
+    Entry expectedResponse =
+        Entry.newBuilder()
+            .setName(name2.toString())
+            .setLinkedResource(linkedResource)
+            .setUserSpecifiedType(userSpecifiedType)
+            .setUserSpecifiedSystem(userSpecifiedSystem)
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-    String entryGroupId = "entryGroupId-43122680";
-    EntryGroup entryGroup = EntryGroup.newBuilder().build();
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
 
-    EntryGroup actualResponse = client.createEntryGroup(formattedParent, entryGroupId, entryGroup);
+    Entry actualResponse = client.getEntry(name);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    CreateEntryGroupRequest actualRequest = (CreateEntryGroupRequest) actualRequests.get(0);
+    GetEntryRequest actualRequest = (GetEntryRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
-    Assert.assertEquals(entryGroupId, actualRequest.getEntryGroupId());
-    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
+    Assert.assertEquals(name, EntryName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -183,16 +260,14 @@ public void createEntryGroupTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void createEntryGroupExceptionTest() throws Exception {
+  public void getEntryExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
-      String entryGroupId = "entryGroupId-43122680";
-      EntryGroup entryGroup = EntryGroup.newBuilder().build();
+      EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
 
-      client.createEntryGroup(formattedParent, entryGroupId, entryGroup);
+      client.getEntry(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -201,31 +276,33 @@ public void createEntryGroupExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void getEntryGroupTest() {
-    String name2 = "name2-1052831874";
+  public void lookupEntryTest() {
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    String linkedResource = "linkedResource1544625012";
+    String userSpecifiedType = "userSpecifiedType-940364963";
+    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    EntryGroup expectedResponse =
-        EntryGroup.newBuilder()
-            .setName(name2)
+    Entry expectedResponse =
+        Entry.newBuilder()
+            .setName(name.toString())
+            .setLinkedResource(linkedResource)
+            .setUserSpecifiedType(userSpecifiedType)
+            .setUserSpecifiedSystem(userSpecifiedSystem)
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-    FieldMask readMask = FieldMask.newBuilder().build();
+    LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
 
-    EntryGroup actualResponse = client.getEntryGroup(formattedName, readMask);
+    Entry actualResponse = client.lookupEntry(request);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    GetEntryGroupRequest actualRequest = (GetEntryGroupRequest) actualRequests.get(0);
+    LookupEntryRequest actualRequest = (LookupEntryRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
-    Assert.assertEquals(readMask, actualRequest.getReadMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -234,16 +311,14 @@ public void getEntryGroupTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void getEntryGroupExceptionTest() throws Exception {
+  public void lookupEntryExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-      FieldMask readMask = FieldMask.newBuilder().build();
+      LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
 
-      client.getEntryGroup(formattedName, readMask);
+      client.lookupEntry(request);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -252,20 +327,21 @@ public void getEntryGroupExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteEntryGroupTest() {
+  public void deleteTagTemplateTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    boolean force = false;
 
-    client.deleteEntryGroup(formattedName);
+    client.deleteTagTemplate(name, force);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteEntryGroupRequest actualRequest = (DeleteEntryGroupRequest) actualRequests.get(0);
+    DeleteTagTemplateRequest actualRequest = (DeleteTagTemplateRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(name, TagTemplateName.parse(actualRequest.getName()));
+    Assert.assertEquals(force, actualRequest.getForce());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -274,15 +350,15 @@ public void deleteEntryGroupTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteEntryGroupExceptionTest() throws Exception {
+  public void deleteTagTemplateExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+      TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      boolean force = false;
 
-      client.deleteEntryGroup(formattedName);
+      client.deleteTagTemplate(name, force);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -291,39 +367,152 @@ public void deleteEntryGroupExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void createEntryTest() {
-    String name = "name3373707";
-    String linkedResource = "linkedResource1544625012";
-    String userSpecifiedType = "userSpecifiedType-940364963";
-    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
+  public void deleteTagTemplateFieldTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    TagTemplateFieldName name =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+    boolean force = false;
+
+    client.deleteTagTemplateField(name, force);
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteTagTemplateFieldRequest actualRequest =
+        (DeleteTagTemplateFieldRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, TagTemplateFieldName.parse(actualRequest.getName()));
+    Assert.assertEquals(force, actualRequest.getForce());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTagTemplateFieldExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      TagTemplateFieldName name =
+          TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+      boolean force = false;
+
+      client.deleteTagTemplateField(name, force);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTagTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+    client.deleteTag(name);
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteTagRequest actualRequest = (DeleteTagRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, EntryName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTagExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+      client.deleteTag(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getIamPolicyTest() {
+    int version = 351608024;
+    ByteString etag = ByteString.copyFromUtf8("21");
+    Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+    Policy actualResponse = client.getIamPolicy(resource);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0);
+
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getIamPolicyExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+
+      client.getIamPolicy(resource);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createEntryGroupTest() {
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    Entry expectedResponse =
-        Entry.newBuilder()
-            .setName(name)
-            .setLinkedResource(linkedResource)
-            .setUserSpecifiedType(userSpecifiedType)
-            .setUserSpecifiedSystem(userSpecifiedSystem)
+    EntryGroup expectedResponse =
+        EntryGroup.newBuilder()
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent =
-        DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-    String entryId = "entryId-2093663224";
-    Entry entry = Entry.newBuilder().build();
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+    String entryGroupId = "entryGroupId-43122680";
+    EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-    Entry actualResponse = client.createEntry(formattedParent, entryId, entry);
+    EntryGroup actualResponse = client.createEntryGroup(parent, entryGroupId, entryGroup);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    CreateEntryRequest actualRequest = (CreateEntryRequest) actualRequests.get(0);
+    CreateEntryGroupRequest actualRequest = (CreateEntryGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
-    Assert.assertEquals(entryId, actualRequest.getEntryId());
-    Assert.assertEquals(entry, actualRequest.getEntry());
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
+    Assert.assertEquals(entryGroupId, actualRequest.getEntryGroupId());
+    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -332,17 +521,16 @@ public void createEntryTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void createEntryExceptionTest() throws Exception {
+  public void createEntryGroupExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent =
-          DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-      String entryId = "entryId-2093663224";
-      Entry entry = Entry.newBuilder().build();
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+      String entryGroupId = "entryGroupId-43122680";
+      EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-      client.createEntry(formattedParent, entryId, entry);
+      client.createEntryGroup(parent, entryGroupId, entryGroup);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -351,36 +539,28 @@ public void createEntryExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryTest() {
-    String name = "name3373707";
-    String linkedResource = "linkedResource1544625012";
-    String userSpecifiedType = "userSpecifiedType-940364963";
-    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
+  public void updateEntryGroupTest() {
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    Entry expectedResponse =
-        Entry.newBuilder()
-            .setName(name)
-            .setLinkedResource(linkedResource)
-            .setUserSpecifiedType(userSpecifiedType)
-            .setUserSpecifiedSystem(userSpecifiedSystem)
+    EntryGroup expectedResponse =
+        EntryGroup.newBuilder()
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    Entry entry = Entry.newBuilder().build();
-    FieldMask updateMask = FieldMask.newBuilder().build();
+    EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-    Entry actualResponse = client.updateEntry(entry, updateMask);
+    EntryGroup actualResponse = client.updateEntryGroup(entryGroup);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    UpdateEntryRequest actualRequest = (UpdateEntryRequest) actualRequests.get(0);
+    UpdateEntryGroupRequest actualRequest = (UpdateEntryGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(entry, actualRequest.getEntry());
-    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -389,15 +569,14 @@ public void updateEntryTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryExceptionTest() throws Exception {
+  public void updateEntryGroupExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      Entry entry = Entry.newBuilder().build();
-      FieldMask updateMask = FieldMask.newBuilder().build();
+      EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-      client.updateEntry(entry, updateMask);
+      client.updateEntryGroup(entryGroup);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -406,20 +585,28 @@ public void updateEntryExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteEntryTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
+  public void updateEntryGroupTest2() {
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+    String displayName = "displayName1615086568";
+    String description = "description-1724546052";
+    EntryGroup expectedResponse =
+        EntryGroup.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setDescription(description)
+            .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-    client.deleteEntry(formattedName);
+    EntryGroup actualResponse = client.updateEntryGroup(entryGroup);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteEntryRequest actualRequest = (DeleteEntryRequest) actualRequests.get(0);
+    UpdateEntryGroupRequest actualRequest = (UpdateEntryGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -428,15 +615,14 @@ public void deleteEntryTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteEntryExceptionTest() throws Exception {
+  public void updateEntryGroupExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      EntryGroup entryGroup = EntryGroup.newBuilder().build();
 
-      client.deleteEntry(formattedName);
+      client.updateEntryGroup(entryGroup);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -445,35 +631,28 @@ public void deleteEntryExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void getEntryTest() {
-    String name2 = "name2-1052831874";
-    String linkedResource = "linkedResource1544625012";
-    String userSpecifiedType = "userSpecifiedType-940364963";
-    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
+  public void getEntryGroupTest() {
+    EntryGroupName name2 = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    Entry expectedResponse =
-        Entry.newBuilder()
-            .setName(name2)
-            .setLinkedResource(linkedResource)
-            .setUserSpecifiedType(userSpecifiedType)
-            .setUserSpecifiedSystem(userSpecifiedSystem)
+    EntryGroup expectedResponse =
+        EntryGroup.newBuilder()
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
 
-    Entry actualResponse = client.getEntry(formattedName);
+    EntryGroup actualResponse = client.getEntryGroup(name);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    GetEntryRequest actualRequest = (GetEntryRequest) actualRequests.get(0);
+    GetEntryGroupRequest actualRequest = (GetEntryGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(name, EntryGroupName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -482,15 +661,14 @@ public void getEntryTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void getEntryExceptionTest() throws Exception {
+  public void getEntryGroupExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
 
-      client.getEntry(formattedName);
+      client.getEntryGroup(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -499,33 +677,30 @@ public void getEntryExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void lookupEntryTest() {
-    String name = "name3373707";
-    String linkedResource = "linkedResource1544625012";
-    String userSpecifiedType = "userSpecifiedType-940364963";
-    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
+  public void getEntryGroupTest2() {
+    EntryGroupName name2 = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    Entry expectedResponse =
-        Entry.newBuilder()
-            .setName(name)
-            .setLinkedResource(linkedResource)
-            .setUserSpecifiedType(userSpecifiedType)
-            .setUserSpecifiedSystem(userSpecifiedSystem)
+    EntryGroup expectedResponse =
+        EntryGroup.newBuilder()
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+    FieldMask readMask = FieldMask.newBuilder().build();
 
-    Entry actualResponse = client.lookupEntry(request);
+    EntryGroup actualResponse = client.getEntryGroup(name, readMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    LookupEntryRequest actualRequest = (LookupEntryRequest) actualRequests.get(0);
+    GetEntryGroupRequest actualRequest = (GetEntryGroupRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, EntryGroupName.parse(actualRequest.getName()));
+    Assert.assertEquals(readMask, actualRequest.getReadMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -534,14 +709,15 @@ public void lookupEntryTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void lookupEntryExceptionTest() throws Exception {
+  public void getEntryGroupExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+      EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+      FieldMask readMask = FieldMask.newBuilder().build();
 
-      client.lookupEntry(request);
+      client.getEntryGroup(name, readMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -551,21 +727,29 @@ public void lookupEntryExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void listEntryGroupsTest() {
-    String nextPageToken = "nextPageToken-1530815211";
+    String nextPageToken = "";
+    EntryGroup entryGroupsElement = EntryGroup.newBuilder().build();
+    List<EntryGroup> entryGroups = Arrays.asList(entryGroupsElement);
     ListEntryGroupsResponse expectedResponse =
-        ListEntryGroupsResponse.newBuilder().setNextPageToken(nextPageToken).build();
+        ListEntryGroupsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllEntryGroups(entryGroups)
+            .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+    EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
 
-    ListEntryGroupsResponse actualResponse = client.listEntryGroups(formattedParent);
-    Assert.assertEquals(expectedResponse, actualResponse);
+    ListEntryGroupsPagedResponse pagedListResponse = client.listEntryGroups(parent);
+
+    List<EntryGroup> resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getEntryGroupsList().get(0), resources.get(0));
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ListEntryGroupsRequest actualRequest = (ListEntryGroupsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, EntryGroupName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -579,9 +763,9 @@ public void listEntryGroupsExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+      EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
 
-      client.listEntryGroups(formattedParent);
+      client.listEntryGroups(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -590,23 +774,38 @@ public void listEntryGroupsExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void listEntriesTest() {
-    String nextPageToken = "nextPageToken-1530815211";
-    ListEntriesResponse expectedResponse =
-        ListEntriesResponse.newBuilder().setNextPageToken(nextPageToken).build();
+  public void createEntryTest() {
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    String linkedResource = "linkedResource1544625012";
+    String userSpecifiedType = "userSpecifiedType-940364963";
+    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
+    String displayName = "displayName1615086568";
+    String description = "description-1724546052";
+    Entry expectedResponse =
+        Entry.newBuilder()
+            .setName(name.toString())
+            .setLinkedResource(linkedResource)
+            .setUserSpecifiedType(userSpecifiedType)
+            .setUserSpecifiedSystem(userSpecifiedSystem)
+            .setDisplayName(displayName)
+            .setDescription(description)
+            .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent =
-        DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+    EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+    String entryId = "entryId-2093663224";
+    Entry entry = Entry.newBuilder().build();
 
-    ListEntriesResponse actualResponse = client.listEntries(formattedParent);
+    Entry actualResponse = client.createEntry(parent, entryId, entry);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    ListEntriesRequest actualRequest = (ListEntriesRequest) actualRequests.get(0);
+    CreateEntryRequest actualRequest = (CreateEntryRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, EntryGroupName.parse(actualRequest.getParent()));
+    Assert.assertEquals(entryId, actualRequest.getEntryId());
+    Assert.assertEquals(entry, actualRequest.getEntry());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -615,15 +814,16 @@ public void listEntriesTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void listEntriesExceptionTest() throws Exception {
+  public void createEntryExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent =
-          DataCatalogClient.formatEntryGroupName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+      EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+      String entryId = "entryId-2093663224";
+      Entry entry = Entry.newBuilder().build();
 
-      client.listEntries(formattedParent);
+      client.createEntry(parent, entryId, entry);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -632,28 +832,34 @@ public void listEntriesExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryGroupTest() {
-    String name = "name3373707";
+  public void updateEntryTest() {
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    String linkedResource = "linkedResource1544625012";
+    String userSpecifiedType = "userSpecifiedType-940364963";
+    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    EntryGroup expectedResponse =
-        EntryGroup.newBuilder()
-            .setName(name)
+    Entry expectedResponse =
+        Entry.newBuilder()
+            .setName(name.toString())
+            .setLinkedResource(linkedResource)
+            .setUserSpecifiedType(userSpecifiedType)
+            .setUserSpecifiedSystem(userSpecifiedSystem)
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    EntryGroup entryGroup = EntryGroup.newBuilder().build();
+    Entry entry = Entry.newBuilder().build();
 
-    EntryGroup actualResponse = client.updateEntryGroup(entryGroup);
+    Entry actualResponse = client.updateEntry(entry);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    UpdateEntryGroupRequest actualRequest = (UpdateEntryGroupRequest) actualRequests.get(0);
+    UpdateEntryRequest actualRequest = (UpdateEntryRequest) actualRequests.get(0);
 
-    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
+    Assert.assertEquals(entry, actualRequest.getEntry());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -662,14 +868,14 @@ public void updateEntryGroupTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryGroupExceptionTest() throws Exception {
+  public void updateEntryExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      EntryGroup entryGroup = EntryGroup.newBuilder().build();
+      Entry entry = Entry.newBuilder().build();
 
-      client.updateEntryGroup(entryGroup);
+      client.updateEntry(entry);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -678,28 +884,34 @@ public void updateEntryGroupExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryGroupTest2() {
-    String name = "name3373707";
+  public void updateEntryTest2() {
+    EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    String linkedResource = "linkedResource1544625012";
+    String userSpecifiedType = "userSpecifiedType-940364963";
+    String userSpecifiedSystem = "userSpecifiedSystem-1776119406";
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
-    EntryGroup expectedResponse =
-        EntryGroup.newBuilder()
-            .setName(name)
+    Entry expectedResponse =
+        Entry.newBuilder()
+            .setName(name.toString())
+            .setLinkedResource(linkedResource)
+            .setUserSpecifiedType(userSpecifiedType)
+            .setUserSpecifiedSystem(userSpecifiedSystem)
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    EntryGroup entryGroup = EntryGroup.newBuilder().build();
+    Entry entry = Entry.newBuilder().build();
 
-    EntryGroup actualResponse = client.updateEntryGroup(entryGroup);
+    Entry actualResponse = client.updateEntry(entry);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    UpdateEntryGroupRequest actualRequest = (UpdateEntryGroupRequest) actualRequests.get(0);
+    UpdateEntryRequest actualRequest = (UpdateEntryRequest) actualRequests.get(0);
 
-    Assert.assertEquals(entryGroup, actualRequest.getEntryGroup());
+    Assert.assertEquals(entry, actualRequest.getEntry());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -708,14 +920,62 @@ public void updateEntryGroupTest2() {
 
   @Test
   @SuppressWarnings("all")
-  public void updateEntryGroupExceptionTest2() throws Exception {
+  public void updateEntryExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      EntryGroup entryGroup = EntryGroup.newBuilder().build();
+      Entry entry = Entry.newBuilder().build();
 
-      client.updateEntryGroup(entryGroup);
+      client.updateEntry(entry);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listEntriesTest() {
+    String nextPageToken = "";
+    Entry entriesElement = Entry.newBuilder().build();
+    List<Entry> entries = Arrays.asList(entriesElement);
+    ListEntriesResponse expectedResponse =
+        ListEntriesResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllEntries(entries)
+            .build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+
+    ListEntriesPagedResponse pagedListResponse = client.listEntries(parent);
+
+    List<Entry> resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getEntriesList().get(0), resources.get(0));
+
+    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListEntriesRequest actualRequest = (ListEntriesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, EntryGroupName.parse(actualRequest.getParent()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listEntriesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+
+      client.listEntries(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -725,25 +985,24 @@ public void updateEntryGroupExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createTagTemplateTest() {
-    String name = "name3373707";
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
     String displayName = "displayName1615086568";
     TagTemplate expectedResponse =
-        TagTemplate.newBuilder().setName(name).setDisplayName(displayName).build();
+        TagTemplate.newBuilder().setName(name.toString()).setDisplayName(displayName).build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
     String tagTemplateId = "tagTemplateId-2020335141";
     TagTemplate tagTemplate = TagTemplate.newBuilder().build();
 
-    TagTemplate actualResponse =
-        client.createTagTemplate(formattedParent, tagTemplateId, tagTemplate);
+    TagTemplate actualResponse = client.createTagTemplate(parent, tagTemplateId, tagTemplate);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     CreateTagTemplateRequest actualRequest = (CreateTagTemplateRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
     Assert.assertEquals(tagTemplateId, actualRequest.getTagTemplateId());
     Assert.assertEquals(tagTemplate, actualRequest.getTagTemplate());
     Assert.assertTrue(
@@ -759,11 +1018,11 @@ public void createTagTemplateExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent = DataCatalogClient.formatLocationName("[PROJECT]", "[LOCATION]");
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
       String tagTemplateId = "tagTemplateId-2020335141";
       TagTemplate tagTemplate = TagTemplate.newBuilder().build();
 
-      client.createTagTemplate(formattedParent, tagTemplateId, tagTemplate);
+      client.createTagTemplate(parent, tagTemplateId, tagTemplate);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -773,23 +1032,22 @@ public void createTagTemplateExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getTagTemplateTest() {
-    String name2 = "name2-1052831874";
+    TagTemplateName name2 = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
     String displayName = "displayName1615086568";
     TagTemplate expectedResponse =
-        TagTemplate.newBuilder().setName(name2).setDisplayName(displayName).build();
+        TagTemplate.newBuilder().setName(name2.toString()).setDisplayName(displayName).build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
 
-    TagTemplate actualResponse = client.getTagTemplate(formattedName);
+    TagTemplate actualResponse = client.getTagTemplate(name);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     GetTagTemplateRequest actualRequest = (GetTagTemplateRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(name, TagTemplateName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -803,10 +1061,9 @@ public void getTagTemplateExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
 
-      client.getTagTemplate(formattedName);
+      client.getTagTemplate(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -816,16 +1073,15 @@ public void getTagTemplateExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateTagTemplateTest() {
-    String name = "name3373707";
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
     String displayName = "displayName1615086568";
     TagTemplate expectedResponse =
-        TagTemplate.newBuilder().setName(name).setDisplayName(displayName).build();
+        TagTemplate.newBuilder().setName(name.toString()).setDisplayName(displayName).build();
     mockDataCatalog.addResponse(expectedResponse);
 
     TagTemplate tagTemplate = TagTemplate.newBuilder().build();
-    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    TagTemplate actualResponse = client.updateTagTemplate(tagTemplate, updateMask);
+    TagTemplate actualResponse = client.updateTagTemplate(tagTemplate);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -833,7 +1089,6 @@ public void updateTagTemplateTest() {
     UpdateTagTemplateRequest actualRequest = (UpdateTagTemplateRequest) actualRequests.get(0);
 
     Assert.assertEquals(tagTemplate, actualRequest.getTagTemplate());
-    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -848,9 +1103,8 @@ public void updateTagTemplateExceptionTest() throws Exception {
 
     try {
       TagTemplate tagTemplate = TagTemplate.newBuilder().build();
-      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateTagTemplate(tagTemplate, updateMask);
+      client.updateTagTemplate(tagTemplate);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -859,22 +1113,23 @@ public void updateTagTemplateExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagTemplateTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
+  public void updateTagTemplateTest2() {
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    String displayName = "displayName1615086568";
+    TagTemplate expectedResponse =
+        TagTemplate.newBuilder().setName(name.toString()).setDisplayName(displayName).build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-    boolean force = false;
+    TagTemplate tagTemplate = TagTemplate.newBuilder().build();
 
-    client.deleteTagTemplate(formattedName, force);
+    TagTemplate actualResponse = client.updateTagTemplate(tagTemplate);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteTagTemplateRequest actualRequest = (DeleteTagTemplateRequest) actualRequests.get(0);
+    UpdateTagTemplateRequest actualRequest = (UpdateTagTemplateRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
-    Assert.assertEquals(force, actualRequest.getForce());
+    Assert.assertEquals(tagTemplate, actualRequest.getTagTemplate());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -883,16 +1138,14 @@ public void deleteTagTemplateTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagTemplateExceptionTest() throws Exception {
+  public void updateTagTemplateExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-      boolean force = false;
+      TagTemplate tagTemplate = TagTemplate.newBuilder().build();
 
-      client.deleteTagTemplate(formattedName, force);
+      client.updateTagTemplate(tagTemplate);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -902,26 +1155,26 @@ public void deleteTagTemplateExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createTagTemplateFieldTest() {
-    String name = "name3373707";
+    TagTemplateFieldName name =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
     String displayName = "displayName1615086568";
     boolean isRequired = true;
     int order = 106006350;
     TagTemplateField expectedResponse =
         TagTemplateField.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setIsRequired(isRequired)
             .setOrder(order)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
     String tagTemplateFieldId = "tagTemplateFieldId-92144832";
     TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
 
     TagTemplateField actualResponse =
-        client.createTagTemplateField(formattedParent, tagTemplateFieldId, tagTemplateField);
+        client.createTagTemplateField(parent, tagTemplateFieldId, tagTemplateField);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -929,7 +1182,7 @@ public void createTagTemplateFieldTest() {
     CreateTagTemplateFieldRequest actualRequest =
         (CreateTagTemplateFieldRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, TagTemplateName.parse(actualRequest.getParent()));
     Assert.assertEquals(tagTemplateFieldId, actualRequest.getTagTemplateFieldId());
     Assert.assertEquals(tagTemplateField, actualRequest.getTagTemplateField());
     Assert.assertTrue(
@@ -945,12 +1198,11 @@ public void createTagTemplateFieldExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      TagTemplateName parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
       String tagTemplateFieldId = "tagTemplateFieldId-92144832";
       TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
 
-      client.createTagTemplateField(formattedParent, tagTemplateFieldId, tagTemplateField);
+      client.createTagTemplateField(parent, tagTemplateFieldId, tagTemplateField);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -960,26 +1212,25 @@ public void createTagTemplateFieldExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateTagTemplateFieldTest() {
-    String name2 = "name2-1052831874";
+    TagTemplateFieldName name2 =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
     String displayName = "displayName1615086568";
     boolean isRequired = true;
     int order = 106006350;
     TagTemplateField expectedResponse =
         TagTemplateField.newBuilder()
-            .setName(name2)
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setIsRequired(isRequired)
             .setOrder(order)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+    TagTemplateFieldName name =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
     TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
-    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    TagTemplateField actualResponse =
-        client.updateTagTemplateField(formattedName, tagTemplateField, updateMask);
+    TagTemplateField actualResponse = client.updateTagTemplateField(name, tagTemplateField);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -987,9 +1238,8 @@ public void updateTagTemplateFieldTest() {
     UpdateTagTemplateFieldRequest actualRequest =
         (UpdateTagTemplateFieldRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(name, TagTemplateFieldName.parse(actualRequest.getName()));
     Assert.assertEquals(tagTemplateField, actualRequest.getTagTemplateField());
-    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1003,12 +1253,11 @@ public void updateTagTemplateFieldExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+      TagTemplateFieldName name =
+          TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
       TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
-      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateTagTemplateField(formattedName, tagTemplateField, updateMask);
+      client.updateTagTemplateField(name, tagTemplateField);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1017,35 +1266,38 @@ public void updateTagTemplateFieldExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void renameTagTemplateFieldTest() {
-    String name2 = "name2-1052831874";
+  public void updateTagTemplateFieldTest2() {
+    TagTemplateFieldName name2 =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
     String displayName = "displayName1615086568";
     boolean isRequired = true;
     int order = 106006350;
     TagTemplateField expectedResponse =
         TagTemplateField.newBuilder()
-            .setName(name2)
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setIsRequired(isRequired)
             .setOrder(order)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-    String newTagTemplateFieldId = "newTagTemplateFieldId-1668354591";
+    TagTemplateFieldName name =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+    TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
     TagTemplateField actualResponse =
-        client.renameTagTemplateField(formattedName, newTagTemplateFieldId);
+        client.updateTagTemplateField(name, tagTemplateField, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    RenameTagTemplateFieldRequest actualRequest =
-        (RenameTagTemplateFieldRequest) actualRequests.get(0);
+    UpdateTagTemplateFieldRequest actualRequest =
+        (UpdateTagTemplateFieldRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
-    Assert.assertEquals(newTagTemplateFieldId, actualRequest.getNewTagTemplateFieldId());
+    Assert.assertEquals(name, TagTemplateFieldName.parse(actualRequest.getName()));
+    Assert.assertEquals(tagTemplateField, actualRequest.getTagTemplateField());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1054,16 +1306,17 @@ public void renameTagTemplateFieldTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void renameTagTemplateFieldExceptionTest() throws Exception {
+  public void updateTagTemplateFieldExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-      String newTagTemplateFieldId = "newTagTemplateFieldId-1668354591";
+      TagTemplateFieldName name =
+          TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+      TagTemplateField tagTemplateField = TagTemplateField.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.renameTagTemplateField(formattedName, newTagTemplateFieldId);
+      client.updateTagTemplateField(name, tagTemplateField, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1072,23 +1325,35 @@ public void renameTagTemplateFieldExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagTemplateFieldTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
+  public void renameTagTemplateFieldTest() {
+    TagTemplateFieldName name2 =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+    String displayName = "displayName1615086568";
+    boolean isRequired = true;
+    int order = 106006350;
+    TagTemplateField expectedResponse =
+        TagTemplateField.newBuilder()
+            .setName(name2.toString())
+            .setDisplayName(displayName)
+            .setIsRequired(isRequired)
+            .setOrder(order)
+            .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-    boolean force = false;
+    TagTemplateFieldName name =
+        TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+    String newTagTemplateFieldId = "newTagTemplateFieldId-1668354591";
 
-    client.deleteTagTemplateField(formattedName, force);
+    TagTemplateField actualResponse = client.renameTagTemplateField(name, newTagTemplateFieldId);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteTagTemplateFieldRequest actualRequest =
-        (DeleteTagTemplateFieldRequest) actualRequests.get(0);
+    RenameTagTemplateFieldRequest actualRequest =
+        (RenameTagTemplateFieldRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
-    Assert.assertEquals(force, actualRequest.getForce());
+    Assert.assertEquals(name, TagTemplateFieldName.parse(actualRequest.getName()));
+    Assert.assertEquals(newTagTemplateFieldId, actualRequest.getNewTagTemplateFieldId());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1097,16 +1362,16 @@ public void deleteTagTemplateFieldTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagTemplateFieldExceptionTest() throws Exception {
+  public void renameTagTemplateFieldExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatFieldName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-      boolean force = false;
+      TagTemplateFieldName name =
+          TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+      String newTagTemplateFieldId = "newTagTemplateFieldId-1668354591";
 
-      client.deleteTagTemplateField(formattedName, force);
+      client.renameTagTemplateField(name, newTagTemplateFieldId);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1116,31 +1381,30 @@ public void deleteTagTemplateFieldExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createTagTest() {
-    String name = "name3373707";
+    TagName name = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
     String template = "template-1321546630";
     String templateDisplayName = "templateDisplayName-532252787";
     String column = "column-1354837162";
     Tag expectedResponse =
         Tag.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setTemplate(template)
             .setTemplateDisplayName(templateDisplayName)
             .setColumn(column)
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent =
-        DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
     Tag tag = Tag.newBuilder().build();
 
-    Tag actualResponse = client.createTag(formattedParent, tag);
+    Tag actualResponse = client.createTag(parent, tag);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     CreateTagRequest actualRequest = (CreateTagRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, TagName.parse(actualRequest.getParent()));
     Assert.assertEquals(tag, actualRequest.getTag());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -1155,11 +1419,10 @@ public void createTagExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent =
-          DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
       Tag tag = Tag.newBuilder().build();
 
-      client.createTag(formattedParent, tag);
+      client.createTag(parent, tag);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1169,13 +1432,13 @@ public void createTagExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateTagTest() {
-    String name = "name3373707";
+    TagName name = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
     String template = "template-1321546630";
     String templateDisplayName = "templateDisplayName-532252787";
     String column = "column-1354837162";
     Tag expectedResponse =
         Tag.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setTemplate(template)
             .setTemplateDisplayName(templateDisplayName)
             .setColumn(column)
@@ -1183,9 +1446,8 @@ public void updateTagTest() {
     mockDataCatalog.addResponse(expectedResponse);
 
     Tag tag = Tag.newBuilder().build();
-    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    Tag actualResponse = client.updateTag(tag, updateMask);
+    Tag actualResponse = client.updateTag(tag);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
@@ -1193,7 +1455,6 @@ public void updateTagTest() {
     UpdateTagRequest actualRequest = (UpdateTagRequest) actualRequests.get(0);
 
     Assert.assertEquals(tag, actualRequest.getTag());
-    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1208,9 +1469,8 @@ public void updateTagExceptionTest() throws Exception {
 
     try {
       Tag tag = Tag.newBuilder().build();
-      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateTag(tag, updateMask);
+      client.updateTag(tag);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1219,21 +1479,30 @@ public void updateTagExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
+  public void updateTagTest2() {
+    TagName name = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
+    String template = "template-1321546630";
+    String templateDisplayName = "templateDisplayName-532252787";
+    String column = "column-1354837162";
+    Tag expectedResponse =
+        Tag.newBuilder()
+            .setName(name.toString())
+            .setTemplate(template)
+            .setTemplateDisplayName(templateDisplayName)
+            .setColumn(column)
+            .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedName =
-        DataCatalogClient.formatTagName(
-            "[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
+    Tag tag = Tag.newBuilder().build();
 
-    client.deleteTag(formattedName);
+    Tag actualResponse = client.updateTag(tag);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteTagRequest actualRequest = (DeleteTagRequest) actualRequests.get(0);
+    UpdateTagRequest actualRequest = (UpdateTagRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertEquals(tag, actualRequest.getTag());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1242,16 +1511,14 @@ public void deleteTagTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteTagExceptionTest() throws Exception {
+  public void updateTagExceptionTest2() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedName =
-          DataCatalogClient.formatTagName(
-              "[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
+      Tag tag = Tag.newBuilder().build();
 
-      client.deleteTag(formattedName);
+      client.updateTag(tag);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1268,10 +1535,9 @@ public void listTagsTest() {
         ListTagsResponse.newBuilder().setNextPageToken(nextPageToken).addAllTags(tags).build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedParent =
-        DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
 
-    ListTagsPagedResponse pagedListResponse = client.listTags(formattedParent);
+    ListTagsPagedResponse pagedListResponse = client.listTags(parent);
 
     List<Tag> resources = Lists.newArrayList(pagedListResponse.iterateAll());
     Assert.assertEquals(1, resources.size());
@@ -1281,7 +1547,7 @@ public void listTagsTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListTagsRequest actualRequest = (ListTagsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(parent, EntryName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1295,10 +1561,9 @@ public void listTagsExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedParent =
-          DataCatalogClient.formatEntryName("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
 
-      client.listTags(formattedParent);
+      client.listTags(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1313,18 +1578,17 @@ public void setIamPolicyTest() {
     Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedResource =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
     Policy policy = Policy.newBuilder().build();
 
-    Policy actualResponse = client.setIamPolicy(formattedResource, policy);
+    Policy actualResponse = client.setIamPolicy(resource, policy);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedResource, actualRequest.getResource());
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
     Assert.assertEquals(policy, actualRequest.getPolicy());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -1339,53 +1603,10 @@ public void setIamPolicyExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedResource =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
       Policy policy = Policy.newBuilder().build();
 
-      client.setIamPolicy(formattedResource, policy);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void getIamPolicyTest() {
-    int version = 351608024;
-    ByteString etag = ByteString.copyFromUtf8("21");
-    Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
-    mockDataCatalog.addResponse(expectedResponse);
-
-    String formattedResource =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-
-    Policy actualResponse = client.getIamPolicy(formattedResource);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0);
-
-    Assert.assertEquals(formattedResource, actualRequest.getResource());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void getIamPolicyExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDataCatalog.addException(exception);
-
-    try {
-      String formattedResource =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-
-      client.getIamPolicy(formattedResource);
+      client.setIamPolicy(resource, policy);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -1398,19 +1619,22 @@ public void testIamPermissionsTest() {
     TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    String formattedResource =
-        DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
     List<String> permissions = new ArrayList<>();
+    TestIamPermissionsRequest request =
+        TestIamPermissionsRequest.newBuilder()
+            .setResource(resource.toString())
+            .addAllPermissions(permissions)
+            .build();
 
-    TestIamPermissionsResponse actualResponse =
-        client.testIamPermissions(formattedResource, permissions);
+    TestIamPermissionsResponse actualResponse = client.testIamPermissions(request);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDataCatalog.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(formattedResource, actualRequest.getResource());
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
     Assert.assertEquals(permissions, actualRequest.getPermissionsList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -1425,11 +1649,15 @@ public void testIamPermissionsExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      String formattedResource =
-          DataCatalogClient.formatTagTemplateName("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
       List<String> permissions = new ArrayList<>();
+      TestIamPermissionsRequest request =
+          TestIamPermissionsRequest.newBuilder()
+              .setResource(resource.toString())
+              .addAllPermissions(permissions)
+              .build();
 
-      client.testIamPermissions(formattedResource, permissions);
+      client.testIamPermissions(request);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
index 77365171..c61da90d 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
@@ -15,6 +15,9 @@
  */
 package com.google.cloud.datacatalog.v1beta1;
 
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListPolicyTagsPagedResponse;
+import static com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient.ListTaxonomiesPagedResponse;
+
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.testing.LocalChannelProvider;
@@ -22,6 +25,8 @@
 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.resourcenames.ResourceName;
+import com.google.common.collect.Lists;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
@@ -33,8 +38,10 @@
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -90,26 +97,29 @@ public void tearDown() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createTaxonomyTest() {
-    String name = "name3373707";
+    TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     Taxonomy expectedResponse =
         Taxonomy.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+    Taxonomy taxonomy = Taxonomy.newBuilder().build();
 
-    Taxonomy actualResponse = client.createTaxonomy(request);
+    Taxonomy actualResponse = client.createTaxonomy(parent, taxonomy);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     CreateTaxonomyRequest actualRequest = (CreateTaxonomyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
+    Assert.assertEquals(taxonomy, actualRequest.getTaxonomy());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -123,9 +133,10 @@ public void createTaxonomyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      CreateTaxonomyRequest request = CreateTaxonomyRequest.newBuilder().build();
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+      Taxonomy taxonomy = Taxonomy.newBuilder().build();
 
-      client.createTaxonomy(request);
+      client.createTaxonomy(parent, taxonomy);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -138,14 +149,15 @@ public void deleteTaxonomyTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder().build();
+    TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-    client.deleteTaxonomy(request);
+    client.deleteTaxonomy(name);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     DeleteTaxonomyRequest actualRequest = (DeleteTaxonomyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, TaxonomyName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -159,9 +171,9 @@ public void deleteTaxonomyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      DeleteTaxonomyRequest request = DeleteTaxonomyRequest.newBuilder().build();
+      TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-      client.deleteTaxonomy(request);
+      client.deleteTaxonomy(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -171,26 +183,27 @@ public void deleteTaxonomyExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateTaxonomyTest() {
-    String name = "name3373707";
+    TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     Taxonomy expectedResponse =
         Taxonomy.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    UpdateTaxonomyRequest request = UpdateTaxonomyRequest.newBuilder().build();
+    Taxonomy taxonomy = Taxonomy.newBuilder().build();
 
-    Taxonomy actualResponse = client.updateTaxonomy(request);
+    Taxonomy actualResponse = client.updateTaxonomy(taxonomy);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     UpdateTaxonomyRequest actualRequest = (UpdateTaxonomyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(taxonomy, actualRequest.getTaxonomy());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -204,9 +217,9 @@ public void updateTaxonomyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      UpdateTaxonomyRequest request = UpdateTaxonomyRequest.newBuilder().build();
+      Taxonomy taxonomy = Taxonomy.newBuilder().build();
 
-      client.updateTaxonomy(request);
+      client.updateTaxonomy(taxonomy);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -216,20 +229,29 @@ public void updateTaxonomyExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void listTaxonomiesTest() {
-    String nextPageToken = "nextPageToken-1530815211";
+    String nextPageToken = "";
+    Taxonomy taxonomiesElement = Taxonomy.newBuilder().build();
+    List<Taxonomy> taxonomies = Arrays.asList(taxonomiesElement);
     ListTaxonomiesResponse expectedResponse =
-        ListTaxonomiesResponse.newBuilder().setNextPageToken(nextPageToken).build();
+        ListTaxonomiesResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllTaxonomies(taxonomies)
+            .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder().build();
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
 
-    ListTaxonomiesResponse actualResponse = client.listTaxonomies(request);
-    Assert.assertEquals(expectedResponse, actualResponse);
+    ListTaxonomiesPagedResponse pagedListResponse = client.listTaxonomies(parent);
+
+    List<Taxonomy> resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getTaxonomiesList().get(0), resources.get(0));
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ListTaxonomiesRequest actualRequest = (ListTaxonomiesRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -243,9 +265,9 @@ public void listTaxonomiesExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      ListTaxonomiesRequest request = ListTaxonomiesRequest.newBuilder().build();
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
 
-      client.listTaxonomies(request);
+      client.listTaxonomies(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -255,26 +277,27 @@ public void listTaxonomiesExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getTaxonomyTest() {
-    String name = "name3373707";
+    TaxonomyName name2 = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     Taxonomy expectedResponse =
         Taxonomy.newBuilder()
-            .setName(name)
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder().build();
+    TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-    Taxonomy actualResponse = client.getTaxonomy(request);
+    Taxonomy actualResponse = client.getTaxonomy(name);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     GetTaxonomyRequest actualRequest = (GetTaxonomyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, TaxonomyName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -288,9 +311,9 @@ public void getTaxonomyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      GetTaxonomyRequest request = GetTaxonomyRequest.newBuilder().build();
+      TaxonomyName name = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-      client.getTaxonomy(request);
+      client.getTaxonomy(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -300,28 +323,31 @@ public void getTaxonomyExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createPolicyTagTest() {
-    String name = "name3373707";
+    PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     String parentPolicyTag = "parentPolicyTag2071382466";
     PolicyTag expectedResponse =
         PolicyTag.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .setParentPolicyTag(parentPolicyTag)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder().build();
+    TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+    PolicyTag policyTag = PolicyTag.newBuilder().build();
 
-    PolicyTag actualResponse = client.createPolicyTag(request);
+    PolicyTag actualResponse = client.createPolicyTag(parent, policyTag);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     CreatePolicyTagRequest actualRequest = (CreatePolicyTagRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, TaxonomyName.parse(actualRequest.getParent()));
+    Assert.assertEquals(policyTag, actualRequest.getPolicyTag());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -335,9 +361,10 @@ public void createPolicyTagExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      CreatePolicyTagRequest request = CreatePolicyTagRequest.newBuilder().build();
+      TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+      PolicyTag policyTag = PolicyTag.newBuilder().build();
 
-      client.createPolicyTag(request);
+      client.createPolicyTag(parent, policyTag);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -350,14 +377,15 @@ public void deletePolicyTagTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder().build();
+    PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
 
-    client.deletePolicyTag(request);
+    client.deletePolicyTag(name);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     DeletePolicyTagRequest actualRequest = (DeletePolicyTagRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, PolicyTagName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -371,9 +399,10 @@ public void deletePolicyTagExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      DeletePolicyTagRequest request = DeletePolicyTagRequest.newBuilder().build();
+      PolicyTagName name =
+          PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
 
-      client.deletePolicyTag(request);
+      client.deletePolicyTag(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -383,28 +412,29 @@ public void deletePolicyTagExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updatePolicyTagTest() {
-    String name = "name3373707";
+    PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     String parentPolicyTag = "parentPolicyTag2071382466";
     PolicyTag expectedResponse =
         PolicyTag.newBuilder()
-            .setName(name)
+            .setName(name.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .setParentPolicyTag(parentPolicyTag)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    UpdatePolicyTagRequest request = UpdatePolicyTagRequest.newBuilder().build();
+    PolicyTag policyTag = PolicyTag.newBuilder().build();
 
-    PolicyTag actualResponse = client.updatePolicyTag(request);
+    PolicyTag actualResponse = client.updatePolicyTag(policyTag);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     UpdatePolicyTagRequest actualRequest = (UpdatePolicyTagRequest) actualRequests.get(0);
 
+    Assert.assertEquals(policyTag, actualRequest.getPolicyTag());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -418,9 +448,9 @@ public void updatePolicyTagExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      UpdatePolicyTagRequest request = UpdatePolicyTagRequest.newBuilder().build();
+      PolicyTag policyTag = PolicyTag.newBuilder().build();
 
-      client.updatePolicyTag(request);
+      client.updatePolicyTag(policyTag);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -430,20 +460,29 @@ public void updatePolicyTagExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void listPolicyTagsTest() {
-    String nextPageToken = "nextPageToken-1530815211";
+    String nextPageToken = "";
+    PolicyTag policyTagsElement = PolicyTag.newBuilder().build();
+    List<PolicyTag> policyTags = Arrays.asList(policyTagsElement);
     ListPolicyTagsResponse expectedResponse =
-        ListPolicyTagsResponse.newBuilder().setNextPageToken(nextPageToken).build();
+        ListPolicyTagsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllPolicyTags(policyTags)
+            .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder().build();
+    TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-    ListPolicyTagsResponse actualResponse = client.listPolicyTags(request);
-    Assert.assertEquals(expectedResponse, actualResponse);
+    ListPolicyTagsPagedResponse pagedListResponse = client.listPolicyTags(parent);
+
+    List<PolicyTag> resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getPolicyTagsList().get(0), resources.get(0));
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ListPolicyTagsRequest actualRequest = (ListPolicyTagsRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, TaxonomyName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -457,9 +496,9 @@ public void listPolicyTagsExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      ListPolicyTagsRequest request = ListPolicyTagsRequest.newBuilder().build();
+      TaxonomyName parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
-      client.listPolicyTags(request);
+      client.listPolicyTags(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -469,28 +508,29 @@ public void listPolicyTagsExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getPolicyTagTest() {
-    String name = "name3373707";
+    PolicyTagName name2 = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
     String displayName = "displayName1615086568";
     String description = "description-1724546052";
     String parentPolicyTag = "parentPolicyTag2071382466";
     PolicyTag expectedResponse =
         PolicyTag.newBuilder()
-            .setName(name)
+            .setName(name2.toString())
             .setDisplayName(displayName)
             .setDescription(description)
             .setParentPolicyTag(parentPolicyTag)
             .build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder().build();
+    PolicyTagName name = PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
 
-    PolicyTag actualResponse = client.getPolicyTag(request);
+    PolicyTag actualResponse = client.getPolicyTag(name);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockPolicyTagManager.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     GetPolicyTagRequest actualRequest = (GetPolicyTagRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, PolicyTagName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -504,9 +544,10 @@ public void getPolicyTagExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      GetPolicyTagRequest request = GetPolicyTagRequest.newBuilder().build();
+      PolicyTagName name =
+          PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]");
 
-      client.getPolicyTag(request);
+      client.getPolicyTag(name);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -521,7 +562,9 @@ public void getIamPolicyTest() {
     Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().build();
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    GetIamPolicyRequest request =
+        GetIamPolicyRequest.newBuilder().setResource(resource.toString()).build();
 
     Policy actualResponse = client.getIamPolicy(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -530,6 +573,7 @@ public void getIamPolicyTest() {
     Assert.assertEquals(1, actualRequests.size());
     GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -543,7 +587,9 @@ public void getIamPolicyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().build();
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      GetIamPolicyRequest request =
+          GetIamPolicyRequest.newBuilder().setResource(resource.toString()).build();
 
       client.getIamPolicy(request);
       Assert.fail("No exception raised");
@@ -560,7 +606,10 @@ public void setIamPolicyTest() {
     Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder().build();
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    Policy policy = Policy.newBuilder().build();
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder().setResource(resource.toString()).setPolicy(policy).build();
 
     Policy actualResponse = client.setIamPolicy(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -569,6 +618,8 @@ public void setIamPolicyTest() {
     Assert.assertEquals(1, actualRequests.size());
     SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0);
 
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertEquals(policy, actualRequest.getPolicy());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -582,7 +633,13 @@ public void setIamPolicyExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder().build();
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      Policy policy = Policy.newBuilder().build();
+      SetIamPolicyRequest request =
+          SetIamPolicyRequest.newBuilder()
+              .setResource(resource.toString())
+              .setPolicy(policy)
+              .build();
 
       client.setIamPolicy(request);
       Assert.fail("No exception raised");
@@ -597,7 +654,13 @@ public void testIamPermissionsTest() {
     TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build();
     mockPolicyTagManager.addResponse(expectedResponse);
 
-    TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder().build();
+    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    List<String> permissions = new ArrayList<>();
+    TestIamPermissionsRequest request =
+        TestIamPermissionsRequest.newBuilder()
+            .setResource(resource.toString())
+            .addAllPermissions(permissions)
+            .build();
 
     TestIamPermissionsResponse actualResponse = client.testIamPermissions(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -606,6 +669,8 @@ public void testIamPermissionsTest() {
     Assert.assertEquals(1, actualRequests.size());
     TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0);
 
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertEquals(permissions, actualRequest.getPermissionsList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -619,7 +684,13 @@ public void testIamPermissionsExceptionTest() throws Exception {
     mockPolicyTagManager.addException(exception);
 
     try {
-      TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder().build();
+      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      List<String> permissions = new ArrayList<>();
+      TestIamPermissionsRequest request =
+          TestIamPermissionsRequest.newBuilder()
+              .setResource(resource.toString())
+              .addAllPermissions(permissions)
+              .build();
 
       client.testIamPermissions(request);
       Assert.fail("No exception raised");
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
index 3a0628d2..3c49e2d9 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
@@ -26,6 +26,7 @@
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -86,7 +87,9 @@ public void importTaxonomiesTest() {
     ImportTaxonomiesResponse expectedResponse = ImportTaxonomiesResponse.newBuilder().build();
     mockPolicyTagManagerSerialization.addResponse(expectedResponse);
 
-    ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+    ImportTaxonomiesRequest request =
+        ImportTaxonomiesRequest.newBuilder().setParent(parent.toString()).build();
 
     ImportTaxonomiesResponse actualResponse = client.importTaxonomies(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -95,6 +98,7 @@ public void importTaxonomiesTest() {
     Assert.assertEquals(1, actualRequests.size());
     ImportTaxonomiesRequest actualRequest = (ImportTaxonomiesRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -108,7 +112,9 @@ public void importTaxonomiesExceptionTest() throws Exception {
     mockPolicyTagManagerSerialization.addException(exception);
 
     try {
-      ImportTaxonomiesRequest request = ImportTaxonomiesRequest.newBuilder().build();
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+      ImportTaxonomiesRequest request =
+          ImportTaxonomiesRequest.newBuilder().setParent(parent.toString()).build();
 
       client.importTaxonomies(request);
       Assert.fail("No exception raised");
@@ -123,7 +129,13 @@ public void exportTaxonomiesTest() {
     ExportTaxonomiesResponse expectedResponse = ExportTaxonomiesResponse.newBuilder().build();
     mockPolicyTagManagerSerialization.addResponse(expectedResponse);
 
-    ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder().build();
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+    List<TaxonomyName> taxonomies = new ArrayList<>();
+    ExportTaxonomiesRequest request =
+        ExportTaxonomiesRequest.newBuilder()
+            .setParent(parent.toString())
+            .addAllTaxonomies(TaxonomyName.toStringList(taxonomies))
+            .build();
 
     ExportTaxonomiesResponse actualResponse = client.exportTaxonomies(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -132,6 +144,8 @@ public void exportTaxonomiesTest() {
     Assert.assertEquals(1, actualRequests.size());
     ExportTaxonomiesRequest actualRequest = (ExportTaxonomiesRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
+    Assert.assertEquals(taxonomies, TaxonomyName.parseList(actualRequest.getTaxonomiesList()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -145,7 +159,13 @@ public void exportTaxonomiesExceptionTest() throws Exception {
     mockPolicyTagManagerSerialization.addException(exception);
 
     try {
-      ExportTaxonomiesRequest request = ExportTaxonomiesRequest.newBuilder().build();
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+      List<TaxonomyName> taxonomies = new ArrayList<>();
+      ExportTaxonomiesRequest request =
+          ExportTaxonomiesRequest.newBuilder()
+              .setParent(parent.toString())
+              .addAllTaxonomies(TaxonomyName.toStringList(taxonomies))
+              .build();
 
       client.exportTaxonomies(request);
       Assert.fail("No exception raised");
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
index f554ba95..715465c5 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
@@ -134,8 +134,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * <pre>
-   * Required. The name of the resource to attach this tag to. Tags can be attached to
-   * Entries. Example:
+   * Required. The name of the resource to attach this tag to. Tags can be
+   * attached to Entries. Example:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * Note that this Tag and its child resources may not actually be stored in
    * the location in this name.
@@ -162,8 +162,8 @@ public java.lang.String getParent() {
    *
    *
    * <pre>
-   * Required. The name of the resource to attach this tag to. Tags can be attached to
-   * Entries. Example:
+   * Required. The name of the resource to attach this tag to. Tags can be
+   * attached to Entries. Example:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * Note that this Tag and its child resources may not actually be stored in
    * the location in this name.
@@ -584,8 +584,8 @@ public Builder mergeFrom(
      *
      *
      * <pre>
-     * Required. The name of the resource to attach this tag to. Tags can be attached to
-     * Entries. Example:
+     * Required. The name of the resource to attach this tag to. Tags can be
+     * attached to Entries. Example:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
      * Note that this Tag and its child resources may not actually be stored in
      * the location in this name.
@@ -612,8 +612,8 @@ public java.lang.String getParent() {
      *
      *
      * <pre>
-     * Required. The name of the resource to attach this tag to. Tags can be attached to
-     * Entries. Example:
+     * Required. The name of the resource to attach this tag to. Tags can be
+     * attached to Entries. Example:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
      * Note that this Tag and its child resources may not actually be stored in
      * the location in this name.
@@ -640,8 +640,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * <pre>
-     * Required. The name of the resource to attach this tag to. Tags can be attached to
-     * Entries. Example:
+     * Required. The name of the resource to attach this tag to. Tags can be
+     * attached to Entries. Example:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
      * Note that this Tag and its child resources may not actually be stored in
      * the location in this name.
@@ -667,8 +667,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The name of the resource to attach this tag to. Tags can be attached to
-     * Entries. Example:
+     * Required. The name of the resource to attach this tag to. Tags can be
+     * attached to Entries. Example:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
      * Note that this Tag and its child resources may not actually be stored in
      * the location in this name.
@@ -690,8 +690,8 @@ public Builder clearParent() {
      *
      *
      * <pre>
-     * Required. The name of the resource to attach this tag to. Tags can be attached to
-     * Entries. Example:
+     * Required. The name of the resource to attach this tag to. Tags can be
+     * attached to Entries. Example:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
      * Note that this Tag and its child resources may not actually be stored in
      * the location in this name.
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequestOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequestOrBuilder.java
index 89f3574b..f4998599 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequestOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface CreateTagRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the resource to attach this tag to. Tags can be attached to
-   * Entries. Example:
+   * Required. The name of the resource to attach this tag to. Tags can be
+   * attached to Entries. Example:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * Note that this Tag and its child resources may not actually be stored in
    * the location in this name.
@@ -45,8 +45,8 @@ public interface CreateTagRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the resource to attach this tag to. Tags can be attached to
-   * Entries. Example:
+   * Required. The name of the resource to attach this tag to. Tags can be
+   * attached to Entries. Example:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
    * Note that this Tag and its child resources may not actually be stored in
    * the location in this name.
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Datacatalog.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Datacatalog.java
index 791ae9bd..6a6aeece 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Datacatalog.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Datacatalog.java
@@ -303,7 +303,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "try\022\027\n\017next_page_token\030\002 \001(\t*[\n\tEntryTyp"
           + "e\022\032\n\026ENTRY_TYPE_UNSPECIFIED\020\000\022\t\n\005TABLE\020\002"
           + "\022\t\n\005MODEL\020\005\022\017\n\013DATA_STREAM\020\003\022\013\n\007FILESET\020"
-          + "\0042\220/\n\013DataCatalog\022\243\001\n\rSearchCatalog\0221.go"
+          + "\0042\255/\n\013DataCatalog\022\243\001\n\rSearchCatalog\0221.go"
           + "ogle.cloud.datacatalog.v1.SearchCatalogR"
           + "equest\0322.google.cloud.datacatalog.v1.Sea"
           + "rchCatalogResponse\"+\202\323\344\223\002\027\"\022/v1/catalog:"
@@ -429,37 +429,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "e\"\213\001\202\323\344\223\002|\022@/v1/{parent=projects/*/locat"
           + "ions/*/entryGroups/*/entries/*}/tagsZ8\0226"
           + "/v1/{parent=projects/*/locations/*/entry"
-          + "Groups/*}/tags\332A\006parent\022\340\001\n\014SetIamPolicy"
+          + "Groups/*}/tags\332A\006parent\022\362\001\n\014SetIamPolicy"
           + "\022\".google.iam.v1.SetIamPolicyRequest\032\025.g"
-          + "oogle.iam.v1.Policy\"\224\001\202\323\344\223\002\215\001\"A/v1/{reso"
+          + "oogle.iam.v1.Policy\"\246\001\202\323\344\223\002\215\001\"A/v1/{reso"
           + "urce=projects/*/locations/*/tagTemplates"
           + "/*}:setIamPolicy:\001*ZE\"@/v1/{resource=pro"
           + "jects/*/locations/*/entryGroups/*}:setIa"
-          + "mPolicy:\001*\022\261\002\n\014GetIamPolicy\022\".google.iam"
-          + ".v1.GetIamPolicyRequest\032\025.google.iam.v1."
-          + "Policy\"\345\001\202\323\344\223\002\336\001\"A/v1/{resource=projects"
-          + "/*/locations/*/tagTemplates/*}:getIamPol"
-          + "icy:\001*ZE\"@/v1/{resource=projects/*/locat"
-          + "ions/*/entryGroups/*}:getIamPolicy:\001*ZO\""
-          + "J/v1/{resource=projects/*/locations/*/en"
-          + "tryGroups/*/entries/*}:getIamPolicy:\001*\022\343"
-          + "\002\n\022TestIamPermissions\022(.google.iam.v1.Te"
-          + "stIamPermissionsRequest\032).google.iam.v1."
-          + "TestIamPermissionsResponse\"\367\001\202\323\344\223\002\360\001\"G/v"
-          + "1/{resource=projects/*/locations/*/tagTe"
-          + "mplates/*}:testIamPermissions:\001*ZK\"F/v1/"
-          + "{resource=projects/*/locations/*/entryGr"
-          + "oups/*}:testIamPermissions:\001*ZU\"P/v1/{re"
-          + "source=projects/*/locations/*/entryGroup"
-          + "s/*/entries/*}:testIamPermissions:\001*\032N\312A"
-          + "\032datacatalog.googleapis.com\322A.https://ww"
-          + "w.googleapis.com/auth/cloud-platformB\313\001\n"
-          + "\037com.google.cloud.datacatalog.v1P\001ZFgoog"
-          + "le.golang.org/genproto/googleapis/cloud/"
-          + "datacatalog/v1;datacatalog\370\001\001\252\002\033Google.C"
-          + "loud.DataCatalog.V1\312\002\033Google\\Cloud\\DataC"
-          + "atalog\\V1\352\002\036Google::Cloud::DataCatalog::"
-          + "V1b\006proto3"
+          + "mPolicy:\001*\332A\017resource,policy\022\274\002\n\014GetIamP"
+          + "olicy\022\".google.iam.v1.GetIamPolicyReques"
+          + "t\032\025.google.iam.v1.Policy\"\360\001\202\323\344\223\002\336\001\"A/v1/"
+          + "{resource=projects/*/locations/*/tagTemp"
+          + "lates/*}:getIamPolicy:\001*ZE\"@/v1/{resourc"
+          + "e=projects/*/locations/*/entryGroups/*}:"
+          + "getIamPolicy:\001*ZO\"J/v1/{resource=project"
+          + "s/*/locations/*/entryGroups/*/entries/*}"
+          + ":getIamPolicy:\001*\332A\010resource\022\343\002\n\022TestIamP"
+          + "ermissions\022(.google.iam.v1.TestIamPermis"
+          + "sionsRequest\032).google.iam.v1.TestIamPerm"
+          + "issionsResponse\"\367\001\202\323\344\223\002\360\001\"G/v1/{resource"
+          + "=projects/*/locations/*/tagTemplates/*}:"
+          + "testIamPermissions:\001*ZK\"F/v1/{resource=p"
+          + "rojects/*/locations/*/entryGroups/*}:tes"
+          + "tIamPermissions:\001*ZU\"P/v1/{resource=proj"
+          + "ects/*/locations/*/entryGroups/*/entries"
+          + "/*}:testIamPermissions:\001*\032N\312A\032datacatalo"
+          + "g.googleapis.com\322A.https://www.googleapi"
+          + "s.com/auth/cloud-platformB\313\001\n\037com.google"
+          + ".cloud.datacatalog.v1P\001ZFgoogle.golang.o"
+          + "rg/genproto/googleapis/cloud/datacatalog"
+          + "/v1;datacatalog\370\001\001\252\002\033Google.Cloud.DataCa"
+          + "talog.V1\312\002\033Google\\Cloud\\DataCatalog\\V1\352\002"
+          + "\036Google::Cloud::DataCatalog::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
index 291d5f10..cb74a16d 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
@@ -636,8 +636,8 @@ public com.google.protobuf.ByteString getUserSpecifiedTypeBytes() {
    *
    *
    * <pre>
-   * Output only. This field indicates the entry's source system that Data Catalog
-   * integrates with, such as BigQuery or Pub/Sub.
+   * Output only. This field indicates the entry's source system that Data
+   * Catalog integrates with, such as BigQuery or Pub/Sub.
    * </pre>
    *
    * <code>
@@ -656,8 +656,8 @@ public int getIntegratedSystemValue() {
    *
    *
    * <pre>
-   * Output only. This field indicates the entry's source system that Data Catalog
-   * integrates with, such as BigQuery or Pub/Sub.
+   * Output only. This field indicates the entry's source system that Data
+   * Catalog integrates with, such as BigQuery or Pub/Sub.
    * </pre>
    *
    * <code>
@@ -2325,8 +2325,8 @@ public Builder setUserSpecifiedTypeBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Output only. This field indicates the entry's source system that Data Catalog
-     * integrates with, such as BigQuery or Pub/Sub.
+     * Output only. This field indicates the entry's source system that Data
+     * Catalog integrates with, such as BigQuery or Pub/Sub.
      * </pre>
      *
      * <code>
@@ -2345,8 +2345,8 @@ public int getIntegratedSystemValue() {
      *
      *
      * <pre>
-     * Output only. This field indicates the entry's source system that Data Catalog
-     * integrates with, such as BigQuery or Pub/Sub.
+     * Output only. This field indicates the entry's source system that Data
+     * Catalog integrates with, such as BigQuery or Pub/Sub.
      * </pre>
      *
      * <code>
@@ -2366,8 +2366,8 @@ public Builder setIntegratedSystemValue(int value) {
      *
      *
      * <pre>
-     * Output only. This field indicates the entry's source system that Data Catalog
-     * integrates with, such as BigQuery or Pub/Sub.
+     * Output only. This field indicates the entry's source system that Data
+     * Catalog integrates with, such as BigQuery or Pub/Sub.
      * </pre>
      *
      * <code>
@@ -2391,8 +2391,8 @@ public com.google.cloud.datacatalog.v1.IntegratedSystem getIntegratedSystem() {
      *
      *
      * <pre>
-     * Output only. This field indicates the entry's source system that Data Catalog
-     * integrates with, such as BigQuery or Pub/Sub.
+     * Output only. This field indicates the entry's source system that Data
+     * Catalog integrates with, such as BigQuery or Pub/Sub.
      * </pre>
      *
      * <code>
@@ -2415,8 +2415,8 @@ public Builder setIntegratedSystem(com.google.cloud.datacatalog.v1.IntegratedSys
      *
      *
      * <pre>
-     * Output only. This field indicates the entry's source system that Data Catalog
-     * integrates with, such as BigQuery or Pub/Sub.
+     * Output only. This field indicates the entry's source system that Data
+     * Catalog integrates with, such as BigQuery or Pub/Sub.
      * </pre>
      *
      * <code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
index b15ebf84..6c66f9e9 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
@@ -304,7 +304,8 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
@@ -320,7 +321,8 @@ public boolean hasDataCatalogTimestamps() {
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
@@ -338,7 +340,8 @@ public com.google.cloud.datacatalog.v1.SystemTimestamps getDataCatalogTimestamps
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
@@ -1087,7 +1090,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1103,7 +1107,8 @@ public boolean hasDataCatalogTimestamps() {
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1125,7 +1130,8 @@ public com.google.cloud.datacatalog.v1.SystemTimestamps getDataCatalogTimestamps
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1150,7 +1156,8 @@ public Builder setDataCatalogTimestamps(
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1172,7 +1179,8 @@ public Builder setDataCatalogTimestamps(
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1201,7 +1209,8 @@ public Builder mergeDataCatalogTimestamps(
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1223,7 +1232,8 @@ public Builder clearDataCatalogTimestamps() {
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1240,7 +1250,8 @@ public Builder clearDataCatalogTimestamps() {
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
@@ -1261,7 +1272,8 @@ public Builder clearDataCatalogTimestamps() {
      *
      *
      * <pre>
-     * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+     * Output only. Timestamps about this EntryGroup. Default value is empty
+     * timestamps.
      * </pre>
      *
      * <code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroupOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroupOrBuilder.java
index 4a2fe873..3df73089 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroupOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroupOrBuilder.java
@@ -114,7 +114,8 @@ public interface EntryGroupOrBuilder
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
@@ -128,7 +129,8 @@ public interface EntryGroupOrBuilder
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
@@ -142,7 +144,8 @@ public interface EntryGroupOrBuilder
    *
    *
    * <pre>
-   * Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
+   * Output only. Timestamps about this EntryGroup. Default value is empty
+   * timestamps.
    * </pre>
    *
    * <code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryOrBuilder.java
index c0b5a994..364676eb 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryOrBuilder.java
@@ -167,8 +167,8 @@ public interface EntryOrBuilder
    *
    *
    * <pre>
-   * Output only. This field indicates the entry's source system that Data Catalog
-   * integrates with, such as BigQuery or Pub/Sub.
+   * Output only. This field indicates the entry's source system that Data
+   * Catalog integrates with, such as BigQuery or Pub/Sub.
    * </pre>
    *
    * <code>
@@ -182,8 +182,8 @@ public interface EntryOrBuilder
    *
    *
    * <pre>
-   * Output only. This field indicates the entry's source system that Data Catalog
-   * integrates with, such as BigQuery or Pub/Sub.
+   * Output only. This field indicates the entry's source system that Data
+   * Catalog integrates with, such as BigQuery or Pub/Sub.
    * </pre>
    *
    * <code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
index 05b0e5a5..ea7ed013 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
@@ -131,8 +131,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * <pre>
-   * Required. The name of the location that contains the entry groups, which can be
-   * provided in URL format. Example:
+   * Required. The name of the location that contains the entry groups, which
+   * can be provided in URL format. Example:
    * * projects/{project_id}/locations/{location}
    * </pre>
    *
@@ -157,8 +157,8 @@ public java.lang.String getParent() {
    *
    *
    * <pre>
-   * Required. The name of the location that contains the entry groups, which can be
-   * provided in URL format. Example:
+   * Required. The name of the location that contains the entry groups, which
+   * can be provided in URL format. Example:
    * * projects/{project_id}/locations/{location}
    * </pre>
    *
@@ -186,8 +186,8 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-   * Throws an invalid argument for `page_size &gt; 1000`.
+   * Optional. The maximum number of items to return. Default is 10. Max limit
+   * is 1000. Throws an invalid argument for `page_size &gt; 1000`.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -204,8 +204,8 @@ public int getPageSize() {
    *
    *
    * <pre>
-   * Optional. Token that specifies which page is requested. If empty, the first page is
-   * returned.
+   * Optional. Token that specifies which page is requested. If empty, the first
+   * page is returned.
    * </pre>
    *
    * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -227,8 +227,8 @@ public java.lang.String getPageToken() {
    *
    *
    * <pre>
-   * Optional. Token that specifies which page is requested. If empty, the first page is
-   * returned.
+   * Optional. Token that specifies which page is requested. If empty, the first
+   * page is returned.
    * </pre>
    *
    * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -603,8 +603,8 @@ public Builder mergeFrom(
      *
      *
      * <pre>
-     * Required. The name of the location that contains the entry groups, which can be
-     * provided in URL format. Example:
+     * Required. The name of the location that contains the entry groups, which
+     * can be provided in URL format. Example:
      * * projects/{project_id}/locations/{location}
      * </pre>
      *
@@ -629,8 +629,8 @@ public java.lang.String getParent() {
      *
      *
      * <pre>
-     * Required. The name of the location that contains the entry groups, which can be
-     * provided in URL format. Example:
+     * Required. The name of the location that contains the entry groups, which
+     * can be provided in URL format. Example:
      * * projects/{project_id}/locations/{location}
      * </pre>
      *
@@ -655,8 +655,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * <pre>
-     * Required. The name of the location that contains the entry groups, which can be
-     * provided in URL format. Example:
+     * Required. The name of the location that contains the entry groups, which
+     * can be provided in URL format. Example:
      * * projects/{project_id}/locations/{location}
      * </pre>
      *
@@ -680,8 +680,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The name of the location that contains the entry groups, which can be
-     * provided in URL format. Example:
+     * Required. The name of the location that contains the entry groups, which
+     * can be provided in URL format. Example:
      * * projects/{project_id}/locations/{location}
      * </pre>
      *
@@ -701,8 +701,8 @@ public Builder clearParent() {
      *
      *
      * <pre>
-     * Required. The name of the location that contains the entry groups, which can be
-     * provided in URL format. Example:
+     * Required. The name of the location that contains the entry groups, which
+     * can be provided in URL format. Example:
      * * projects/{project_id}/locations/{location}
      * </pre>
      *
@@ -729,8 +729,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-     * Throws an invalid argument for `page_size &gt; 1000`.
+     * Optional. The maximum number of items to return. Default is 10. Max limit
+     * is 1000. Throws an invalid argument for `page_size &gt; 1000`.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -744,8 +744,8 @@ public int getPageSize() {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-     * Throws an invalid argument for `page_size &gt; 1000`.
+     * Optional. The maximum number of items to return. Default is 10. Max limit
+     * is 1000. Throws an invalid argument for `page_size &gt; 1000`.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -763,8 +763,8 @@ public Builder setPageSize(int value) {
      *
      *
      * <pre>
-     * Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-     * Throws an invalid argument for `page_size &gt; 1000`.
+     * Optional. The maximum number of items to return. Default is 10. Max limit
+     * is 1000. Throws an invalid argument for `page_size &gt; 1000`.
      * </pre>
      *
      * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -783,8 +783,8 @@ public Builder clearPageSize() {
      *
      *
      * <pre>
-     * Optional. Token that specifies which page is requested. If empty, the first page is
-     * returned.
+     * Optional. Token that specifies which page is requested. If empty, the first
+     * page is returned.
      * </pre>
      *
      * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -806,8 +806,8 @@ public java.lang.String getPageToken() {
      *
      *
      * <pre>
-     * Optional. Token that specifies which page is requested. If empty, the first page is
-     * returned.
+     * Optional. Token that specifies which page is requested. If empty, the first
+     * page is returned.
      * </pre>
      *
      * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -829,8 +829,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      *
      *
      * <pre>
-     * Optional. Token that specifies which page is requested. If empty, the first page is
-     * returned.
+     * Optional. Token that specifies which page is requested. If empty, the first
+     * page is returned.
      * </pre>
      *
      * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -851,8 +851,8 @@ public Builder setPageToken(java.lang.String value) {
      *
      *
      * <pre>
-     * Optional. Token that specifies which page is requested. If empty, the first page is
-     * returned.
+     * Optional. Token that specifies which page is requested. If empty, the first
+     * page is returned.
      * </pre>
      *
      * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -869,8 +869,8 @@ public Builder clearPageToken() {
      *
      *
      * <pre>
-     * Optional. Token that specifies which page is requested. If empty, the first page is
-     * returned.
+     * Optional. Token that specifies which page is requested. If empty, the first
+     * page is returned.
      * </pre>
      *
      * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequestOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequestOrBuilder.java
index ec83aa42..7b30a99e 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequestOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface ListEntryGroupsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the location that contains the entry groups, which can be
-   * provided in URL format. Example:
+   * Required. The name of the location that contains the entry groups, which
+   * can be provided in URL format. Example:
    * * projects/{project_id}/locations/{location}
    * </pre>
    *
@@ -43,8 +43,8 @@ public interface ListEntryGroupsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the location that contains the entry groups, which can be
-   * provided in URL format. Example:
+   * Required. The name of the location that contains the entry groups, which
+   * can be provided in URL format. Example:
    * * projects/{project_id}/locations/{location}
    * </pre>
    *
@@ -60,8 +60,8 @@ public interface ListEntryGroupsRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-   * Throws an invalid argument for `page_size &gt; 1000`.
+   * Optional. The maximum number of items to return. Default is 10. Max limit
+   * is 1000. Throws an invalid argument for `page_size &gt; 1000`.
    * </pre>
    *
    * <code>int32 page_size = 2 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -74,8 +74,8 @@ public interface ListEntryGroupsRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. Token that specifies which page is requested. If empty, the first page is
-   * returned.
+   * Optional. Token that specifies which page is requested. If empty, the first
+   * page is returned.
    * </pre>
    *
    * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
@@ -87,8 +87,8 @@ public interface ListEntryGroupsRequestOrBuilder
    *
    *
    * <pre>
-   * Optional. Token that specifies which page is requested. If empty, the first page is
-   * returned.
+   * Optional. Token that specifies which page is requested. If empty, the first
+   * page is returned.
    * </pre>
    *
    * <code>string page_token = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
index a07a5d65..2aa0c525 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
@@ -131,8 +131,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * <pre>
-   * Required. The name of the Data Catalog resource to list the tags of. The resource
-   * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+   * Required. The name of the Data Catalog resource to list the tags of. The
+   * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
    * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
    * Examples:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -160,8 +160,8 @@ public java.lang.String getParent() {
    *
    *
    * <pre>
-   * Required. The name of the Data Catalog resource to list the tags of. The resource
-   * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+   * Required. The name of the Data Catalog resource to list the tags of. The
+   * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
    * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
    * Examples:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -606,8 +606,8 @@ public Builder mergeFrom(
      *
      *
      * <pre>
-     * Required. The name of the Data Catalog resource to list the tags of. The resource
-     * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+     * Required. The name of the Data Catalog resource to list the tags of. The
+     * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
      * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
      * Examples:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -635,8 +635,8 @@ public java.lang.String getParent() {
      *
      *
      * <pre>
-     * Required. The name of the Data Catalog resource to list the tags of. The resource
-     * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+     * Required. The name of the Data Catalog resource to list the tags of. The
+     * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
      * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
      * Examples:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -664,8 +664,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * <pre>
-     * Required. The name of the Data Catalog resource to list the tags of. The resource
-     * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+     * Required. The name of the Data Catalog resource to list the tags of. The
+     * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
      * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
      * Examples:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -692,8 +692,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The name of the Data Catalog resource to list the tags of. The resource
-     * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+     * Required. The name of the Data Catalog resource to list the tags of. The
+     * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
      * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
      * Examples:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -716,8 +716,8 @@ public Builder clearParent() {
      *
      *
      * <pre>
-     * Required. The name of the Data Catalog resource to list the tags of. The resource
-     * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+     * Required. The name of the Data Catalog resource to list the tags of. The
+     * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
      * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
      * Examples:
      * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequestOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequestOrBuilder.java
index 34b2b83f..801fb7ab 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequestOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface ListTagsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the Data Catalog resource to list the tags of. The resource
-   * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+   * Required. The name of the Data Catalog resource to list the tags of. The
+   * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
    * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
    * Examples:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
@@ -46,8 +46,8 @@ public interface ListTagsRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The name of the Data Catalog resource to list the tags of. The resource
-   * could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+   * Required. The name of the Data Catalog resource to list the tags of. The
+   * resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
    * [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
    * Examples:
    * * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
index a4b4a090..01bf0c77 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
@@ -179,7 +179,8 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * <pre>
-   * Required. The new ID of this tag template field. For example, `my_new_field`.
+   * Required. The new ID of this tag template field. For example,
+   * `my_new_field`.
    * </pre>
    *
    * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -201,7 +202,8 @@ public java.lang.String getNewTagTemplateFieldId() {
    *
    *
    * <pre>
-   * Required. The new ID of this tag template field. For example, `my_new_field`.
+   * Required. The new ID of this tag template field. For example,
+   * `my_new_field`.
    * </pre>
    *
    * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -685,7 +687,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Required. The new ID of this tag template field. For example, `my_new_field`.
+     * Required. The new ID of this tag template field. For example,
+     * `my_new_field`.
      * </pre>
      *
      * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -707,7 +710,8 @@ public java.lang.String getNewTagTemplateFieldId() {
      *
      *
      * <pre>
-     * Required. The new ID of this tag template field. For example, `my_new_field`.
+     * Required. The new ID of this tag template field. For example,
+     * `my_new_field`.
      * </pre>
      *
      * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -729,7 +733,8 @@ public com.google.protobuf.ByteString getNewTagTemplateFieldIdBytes() {
      *
      *
      * <pre>
-     * Required. The new ID of this tag template field. For example, `my_new_field`.
+     * Required. The new ID of this tag template field. For example,
+     * `my_new_field`.
      * </pre>
      *
      * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -750,7 +755,8 @@ public Builder setNewTagTemplateFieldId(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The new ID of this tag template field. For example, `my_new_field`.
+     * Required. The new ID of this tag template field. For example,
+     * `my_new_field`.
      * </pre>
      *
      * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -767,7 +773,8 @@ public Builder clearNewTagTemplateFieldId() {
      *
      *
      * <pre>
-     * Required. The new ID of this tag template field. For example, `my_new_field`.
+     * Required. The new ID of this tag template field. For example,
+     * `my_new_field`.
      * </pre>
      *
      * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequestOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequestOrBuilder.java
index ff360676..ce17a6b2 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequestOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequestOrBuilder.java
@@ -58,7 +58,8 @@ public interface RenameTagTemplateFieldRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The new ID of this tag template field. For example, `my_new_field`.
+   * Required. The new ID of this tag template field. For example,
+   * `my_new_field`.
    * </pre>
    *
    * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -70,7 +71,8 @@ public interface RenameTagTemplateFieldRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The new ID of this tag template field. For example, `my_new_field`.
+   * Required. The new ID of this tag template field. For example,
+   * `my_new_field`.
    * </pre>
    *
    * <code>string new_tag_template_field_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
index ac59a7c5..f27db642 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
@@ -2416,7 +2416,8 @@ public com.google.cloud.datacatalog.v1.SearchCatalogRequest.ScopeOrBuilder getSc
    *
    *
    * <pre>
-   * Required. The query string in search query syntax. The query must be non-empty.
+   * Required. The query string in search query syntax. The query must be
+   * non-empty.
    * Query strings can be simple as "x" or more qualified as:
    * * name:x
    * * column:x
@@ -2446,7 +2447,8 @@ public java.lang.String getQuery() {
    *
    *
    * <pre>
-   * Required. The query string in search query syntax. The query must be non-empty.
+   * Required. The query string in search query syntax. The query must be
+   * non-empty.
    * Query strings can be simple as "x" or more qualified as:
    * * name:x
    * * column:x
@@ -2498,8 +2500,8 @@ public int getPageSize() {
    *
    * <pre>
    * Optional. Pagination token returned in an earlier
-   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-   * indicates that this is a continuation of a prior
+   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+   * which indicates that this is a continuation of a prior
    * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
    * call, and that the system should return the next page of data. If empty,
    * the first page is returned.
@@ -2525,8 +2527,8 @@ public java.lang.String getPageToken() {
    *
    * <pre>
    * Optional. Pagination token returned in an earlier
-   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-   * indicates that this is a continuation of a prior
+   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+   * which indicates that this is a continuation of a prior
    * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
    * call, and that the system should return the next page of data. If empty,
    * the first page is returned.
@@ -3235,7 +3237,8 @@ public com.google.cloud.datacatalog.v1.SearchCatalogRequest.ScopeOrBuilder getSc
      *
      *
      * <pre>
-     * Required. The query string in search query syntax. The query must be non-empty.
+     * Required. The query string in search query syntax. The query must be
+     * non-empty.
      * Query strings can be simple as "x" or more qualified as:
      * * name:x
      * * column:x
@@ -3265,7 +3268,8 @@ public java.lang.String getQuery() {
      *
      *
      * <pre>
-     * Required. The query string in search query syntax. The query must be non-empty.
+     * Required. The query string in search query syntax. The query must be
+     * non-empty.
      * Query strings can be simple as "x" or more qualified as:
      * * name:x
      * * column:x
@@ -3295,7 +3299,8 @@ public com.google.protobuf.ByteString getQueryBytes() {
      *
      *
      * <pre>
-     * Required. The query string in search query syntax. The query must be non-empty.
+     * Required. The query string in search query syntax. The query must be
+     * non-empty.
      * Query strings can be simple as "x" or more qualified as:
      * * name:x
      * * column:x
@@ -3324,7 +3329,8 @@ public Builder setQuery(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The query string in search query syntax. The query must be non-empty.
+     * Required. The query string in search query syntax. The query must be
+     * non-empty.
      * Query strings can be simple as "x" or more qualified as:
      * * name:x
      * * column:x
@@ -3349,7 +3355,8 @@ public Builder clearQuery() {
      *
      *
      * <pre>
-     * Required. The query string in search query syntax. The query must be non-empty.
+     * Required. The query string in search query syntax. The query must be
+     * non-empty.
      * Query strings can be simple as "x" or more qualified as:
      * * name:x
      * * column:x
@@ -3436,8 +3443,8 @@ public Builder clearPageSize() {
      *
      * <pre>
      * Optional. Pagination token returned in an earlier
-     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-     * indicates that this is a continuation of a prior
+     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+     * which indicates that this is a continuation of a prior
      * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
      * call, and that the system should return the next page of data. If empty,
      * the first page is returned.
@@ -3463,8 +3470,8 @@ public java.lang.String getPageToken() {
      *
      * <pre>
      * Optional. Pagination token returned in an earlier
-     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-     * indicates that this is a continuation of a prior
+     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+     * which indicates that this is a continuation of a prior
      * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
      * call, and that the system should return the next page of data. If empty,
      * the first page is returned.
@@ -3490,8 +3497,8 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      *
      * <pre>
      * Optional. Pagination token returned in an earlier
-     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-     * indicates that this is a continuation of a prior
+     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+     * which indicates that this is a continuation of a prior
      * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
      * call, and that the system should return the next page of data. If empty,
      * the first page is returned.
@@ -3516,8 +3523,8 @@ public Builder setPageToken(java.lang.String value) {
      *
      * <pre>
      * Optional. Pagination token returned in an earlier
-     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-     * indicates that this is a continuation of a prior
+     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+     * which indicates that this is a continuation of a prior
      * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
      * call, and that the system should return the next page of data. If empty,
      * the first page is returned.
@@ -3538,8 +3545,8 @@ public Builder clearPageToken() {
      *
      * <pre>
      * Optional. Pagination token returned in an earlier
-     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-     * indicates that this is a continuation of a prior
+     * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+     * which indicates that this is a continuation of a prior
      * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
      * call, and that the system should return the next page of data. If empty,
      * the first page is returned.
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequestOrBuilder.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequestOrBuilder.java
index a5f3545e..ef1f18f7 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequestOrBuilder.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequestOrBuilder.java
@@ -77,7 +77,8 @@ public interface SearchCatalogRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The query string in search query syntax. The query must be non-empty.
+   * Required. The query string in search query syntax. The query must be
+   * non-empty.
    * Query strings can be simple as "x" or more qualified as:
    * * name:x
    * * column:x
@@ -97,7 +98,8 @@ public interface SearchCatalogRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The query string in search query syntax. The query must be non-empty.
+   * Required. The query string in search query syntax. The query must be
+   * non-empty.
    * Query strings can be simple as "x" or more qualified as:
    * * name:x
    * * column:x
@@ -133,8 +135,8 @@ public interface SearchCatalogRequestOrBuilder
    *
    * <pre>
    * Optional. Pagination token returned in an earlier
-   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-   * indicates that this is a continuation of a prior
+   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+   * which indicates that this is a continuation of a prior
    * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
    * call, and that the system should return the next page of data. If empty,
    * the first page is returned.
@@ -150,8 +152,8 @@ public interface SearchCatalogRequestOrBuilder
    *
    * <pre>
    * Optional. Pagination token returned in an earlier
-   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-   * indicates that this is a continuation of a prior
+   * [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+   * which indicates that this is a continuation of a prior
    * [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
    * call, and that the system should return the next page of data. If empty,
    * the first page is returned.
diff --git a/proto-google-cloud-datacatalog-v1/src/main/proto/google/cloud/datacatalog/v1/datacatalog.proto b/proto-google-cloud-datacatalog-v1/src/main/proto/google/cloud/datacatalog/v1/datacatalog.proto
index 689af453..c5b700dd 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/proto/google/cloud/datacatalog/v1/datacatalog.proto
+++ b/proto-google-cloud-datacatalog-v1/src/main/proto/google/cloud/datacatalog/v1/datacatalog.proto
@@ -44,7 +44,8 @@ option ruby_package = "Google::Cloud::DataCatalog::V1";
 // their data.
 service DataCatalog {
   option (google.api.default_host) = "datacatalog.googleapis.com";
-  option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform";
+  option (google.api.oauth_scopes) =
+      "https://www.googleapis.com/auth/cloud-platform";
 
   // Searches Data Catalog for multiple resources like entries, tags that
   // match a query.
@@ -125,7 +126,8 @@ service DataCatalog {
   // identified by the `name` parameter (see [Data Catalog Resource Project]
   // (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for
   // more information).
-  rpc DeleteEntryGroup(DeleteEntryGroupRequest) returns (google.protobuf.Empty) {
+  rpc DeleteEntryGroup(DeleteEntryGroupRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v1/{name=projects/*/locations/*/entryGroups/*}"
     };
@@ -133,7 +135,8 @@ service DataCatalog {
   }
 
   // Lists entry groups.
-  rpc ListEntryGroups(ListEntryGroupsRequest) returns (ListEntryGroupsResponse) {
+  rpc ListEntryGroups(ListEntryGroupsRequest)
+      returns (ListEntryGroupsResponse) {
     option (google.api.http) = {
       get: "/v1/{parent=projects/*/locations/*}/entryGroups"
     };
@@ -220,7 +223,8 @@ service DataCatalog {
       post: "/v1/{parent=projects/*/locations/*}/tagTemplates"
       body: "tag_template"
     };
-    option (google.api.method_signature) = "parent,tag_template_id,tag_template";
+    option (google.api.method_signature) =
+        "parent,tag_template_id,tag_template";
   }
 
   // Gets a tag template.
@@ -252,7 +256,8 @@ service DataCatalog {
   // the `name` parameter (see [Data Catalog Resource Project]
   // (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for
   // more information).
-  rpc DeleteTagTemplate(DeleteTagTemplateRequest) returns (google.protobuf.Empty) {
+  rpc DeleteTagTemplate(DeleteTagTemplateRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v1/{name=projects/*/locations/*/tagTemplates/*}"
     };
@@ -264,12 +269,14 @@ service DataCatalog {
   // [Data Catalog Resource
   // Project](https://cloud.google.com/data-catalog/docs/concepts/resource-project)
   // for more information).
-  rpc CreateTagTemplateField(CreateTagTemplateFieldRequest) returns (TagTemplateField) {
+  rpc CreateTagTemplateField(CreateTagTemplateFieldRequest)
+      returns (TagTemplateField) {
     option (google.api.http) = {
       post: "/v1/{parent=projects/*/locations/*/tagTemplates/*}/fields"
       body: "tag_template_field"
     };
-    option (google.api.method_signature) = "parent,tag_template_field_id,tag_template_field";
+    option (google.api.method_signature) =
+        "parent,tag_template_field_id,tag_template_field";
   }
 
   // Updates a field in a tag template. This method cannot be used to update the
@@ -277,13 +284,15 @@ service DataCatalog {
   // identified by the `name` parameter (see [Data Catalog Resource Project]
   // (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for
   // more information).
-  rpc UpdateTagTemplateField(UpdateTagTemplateFieldRequest) returns (TagTemplateField) {
+  rpc UpdateTagTemplateField(UpdateTagTemplateFieldRequest)
+      returns (TagTemplateField) {
     option (google.api.http) = {
       patch: "/v1/{name=projects/*/locations/*/tagTemplates/*/fields/*}"
       body: "tag_template_field"
     };
     option (google.api.method_signature) = "name,tag_template_field";
-    option (google.api.method_signature) = "name,tag_template_field,update_mask";
+    option (google.api.method_signature) =
+        "name,tag_template_field,update_mask";
   }
 
   // Renames a field in a tag template. The user should enable the Data Catalog
@@ -291,7 +300,8 @@ service DataCatalog {
   // Resource
   // Project](https://cloud.google.com/data-catalog/docs/concepts/resource-project)
   // for more information).
-  rpc RenameTagTemplateField(RenameTagTemplateFieldRequest) returns (TagTemplateField) {
+  rpc RenameTagTemplateField(RenameTagTemplateFieldRequest)
+      returns (TagTemplateField) {
     option (google.api.http) = {
       post: "/v1/{name=projects/*/locations/*/tagTemplates/*/fields/*}:rename"
       body: "*"
@@ -304,7 +314,8 @@ service DataCatalog {
   // the `name` parameter (see [Data Catalog Resource Project]
   // (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for
   // more information).
-  rpc DeleteTagTemplateField(DeleteTagTemplateFieldRequest) returns (google.protobuf.Empty) {
+  rpc DeleteTagTemplateField(DeleteTagTemplateFieldRequest)
+      returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/v1/{name=projects/*/locations/*/tagTemplates/*/fields/*}"
     };
@@ -380,7 +391,8 @@ service DataCatalog {
   //     templates.
   //   - `datacatalog.entries.setIamPolicy` to set policies on entries.
   //   - `datacatalog.entryGroups.setIamPolicy` to set policies on entry groups.
-  rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) {
+  rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest)
+      returns (google.iam.v1.Policy) {
     option (google.api.http) = {
       post: "/v1/{resource=projects/*/locations/*/tagTemplates/*}:setIamPolicy"
       body: "*"
@@ -389,6 +401,7 @@ service DataCatalog {
         body: "*"
       }
     };
+    option (google.api.method_signature) = "resource,policy";
   }
 
   // Gets the access control policy for a resource. A `NOT_FOUND` error
@@ -407,7 +420,8 @@ service DataCatalog {
   //     templates.
   //   - `datacatalog.entries.getIamPolicy` to get policies on entries.
   //   - `datacatalog.entryGroups.getIamPolicy` to get policies on entry groups.
-  rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) {
+  rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest)
+      returns (google.iam.v1.Policy) {
     option (google.api.http) = {
       post: "/v1/{resource=projects/*/locations/*/tagTemplates/*}:getIamPolicy"
       body: "*"
@@ -420,6 +434,7 @@ service DataCatalog {
         body: "*"
       }
     };
+    option (google.api.method_signature) = "resource";
   }
 
   // Returns the caller's permissions on a resource.
@@ -435,7 +450,8 @@ service DataCatalog {
   //
   // A caller is not required to have Google IAM permission to make this
   // request.
-  rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) {
+  rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest)
+      returns (google.iam.v1.TestIamPermissionsResponse) {
     option (google.api.http) = {
       post: "/v1/{resource=projects/*/locations/*/tagTemplates/*}:testIamPermissions"
       body: "*"
@@ -507,7 +523,8 @@ message SearchCatalogRequest {
     //  * us-east4
     //  * us-west1
     //  * us-west2
-    repeated string restricted_locations = 16 [(google.api.field_behavior) = OPTIONAL];
+    repeated string restricted_locations = 16
+        [(google.api.field_behavior) = OPTIONAL];
   }
 
   // Required. The scope of this search request. A `scope` that has empty
@@ -516,7 +533,8 @@ message SearchCatalogRequest {
   // return an error in such a case.
   Scope scope = 6 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The query string in search query syntax. The query must be non-empty.
+  // Required. The query string in search query syntax. The query must be
+  // non-empty.
   //
   // Query strings can be simple as "x" or more qualified as:
   //
@@ -535,8 +553,8 @@ message SearchCatalogRequest {
   int32 page_size = 2;
 
   // Optional. Pagination token returned in an earlier
-  // [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token], which
-  // indicates that this is a continuation of a prior
+  // [SearchCatalogResponse.next_page_token][google.cloud.datacatalog.v1.SearchCatalogResponse.next_page_token],
+  // which indicates that this is a continuation of a prior
   // [SearchCatalogRequest][google.cloud.datacatalog.v1.DataCatalog.SearchCatalog]
   // call, and that the system should return the next page of data. If empty,
   // the first page is returned.
@@ -640,8 +658,8 @@ message DeleteEntryGroupRequest {
 // Request message for
 // [ListEntryGroups][google.cloud.datacatalog.v1.DataCatalog.ListEntryGroups].
 message ListEntryGroupsRequest {
-  // Required. The name of the location that contains the entry groups, which can be
-  // provided in URL format. Example:
+  // Required. The name of the location that contains the entry groups, which
+  // can be provided in URL format. Example:
   //
   // * projects/{project_id}/locations/{location}
   string parent = 1 [
@@ -651,12 +669,12 @@ message ListEntryGroupsRequest {
     }
   ];
 
-  // Optional. The maximum number of items to return. Default is 10. Max limit is 1000.
-  // Throws an invalid argument for `page_size > 1000`.
+  // Optional. The maximum number of items to return. Default is 10. Max limit
+  // is 1000. Throws an invalid argument for `page_size > 1000`.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. Token that specifies which page is requested. If empty, the first page is
-  // returned.
+  // Optional. Token that specifies which page is requested. If empty, the first
+  // page is returned.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
@@ -807,8 +825,8 @@ message Entry {
   // Note that this Entry and its child resources may not actually be stored in
   // the location in this name.
   string name = 1 [(google.api.resource_reference) = {
-                     type: "datacatalog.googleapis.com/EntryGroup"
-                   }];
+    type: "datacatalog.googleapis.com/EntryGroup"
+  }];
 
   // The resource this metadata entry refers to.
   //
@@ -845,9 +863,10 @@ message Entry {
 
   // The source system of the entry.
   oneof system {
-    // Output only. This field indicates the entry's source system that Data Catalog
-    // integrates with, such as BigQuery or Pub/Sub.
-    IntegratedSystem integrated_system = 17 [(google.api.field_behavior) = OUTPUT_ONLY];
+    // Output only. This field indicates the entry's source system that Data
+    // Catalog integrates with, such as BigQuery or Pub/Sub.
+    IntegratedSystem integrated_system = 17
+        [(google.api.field_behavior) = OUTPUT_ONLY];
 
     // This field indicates the entry's source system that Data Catalog does not
     // integrate with. `user_specified_system` strings must begin with a letter
@@ -918,8 +937,10 @@ message EntryGroup {
   // string.
   string description = 3;
 
-  // Output only. Timestamps about this EntryGroup. Default value is empty timestamps.
-  SystemTimestamps data_catalog_timestamps = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+  // Output only. Timestamps about this EntryGroup. Default value is empty
+  // timestamps.
+  SystemTimestamps data_catalog_timestamps = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
 // Request message for
@@ -997,8 +1018,8 @@ message DeleteTagTemplateRequest {
 // Request message for
 // [CreateTag][google.cloud.datacatalog.v1.DataCatalog.CreateTag].
 message CreateTagRequest {
-  // Required. The name of the resource to attach this tag to. Tags can be attached to
-  // Entries. Example:
+  // Required. The name of the resource to attach this tag to. Tags can be
+  // attached to Entries. Example:
   //
   // * projects/{project_id}/locations/{location}/entryGroups/{entry_group_id}/entries/{entry_id}
   //
@@ -1006,9 +1027,7 @@ message CreateTagRequest {
   // the location in this name.
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = {
-      type: "datacatalog.googleapis.com/Tag"
-    }
+    (google.api.resource_reference) = { type: "datacatalog.googleapis.com/Tag" }
   ];
 
   // Required. The tag to create.
@@ -1064,7 +1083,8 @@ message CreateTagTemplateFieldRequest {
   string tag_template_field_id = 2 [(google.api.field_behavior) = REQUIRED];
 
   // Required. The tag template field to create.
-  TagTemplateField tag_template_field = 3 [(google.api.field_behavior) = REQUIRED];
+  TagTemplateField tag_template_field = 3
+      [(google.api.field_behavior) = REQUIRED];
 }
 
 // Request message for
@@ -1081,7 +1101,8 @@ message UpdateTagTemplateFieldRequest {
   ];
 
   // Required. The template to update.
-  TagTemplateField tag_template_field = 2 [(google.api.field_behavior) = REQUIRED];
+  TagTemplateField tag_template_field = 2
+      [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The field mask specifies the parts of the template to be updated.
   // Allowed fields:
@@ -1097,7 +1118,8 @@ message UpdateTagTemplateFieldRequest {
   // existing values. Therefore, enum values can only be added, existing enum
   // values cannot be deleted nor renamed. Updating a template field from
   // optional to required is NOT allowed.
-  google.protobuf.FieldMask update_mask = 3 [(google.api.field_behavior) = OPTIONAL];
+  google.protobuf.FieldMask update_mask = 3
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for
@@ -1113,7 +1135,8 @@ message RenameTagTemplateFieldRequest {
     }
   ];
 
-  // Required. The new ID of this tag template field. For example, `my_new_field`.
+  // Required. The new ID of this tag template field. For example,
+  // `my_new_field`.
   string new_tag_template_field_id = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
@@ -1139,8 +1162,8 @@ message DeleteTagTemplateFieldRequest {
 // Request message for
 // [ListTags][google.cloud.datacatalog.v1.DataCatalog.ListTags].
 message ListTagsRequest {
-  // Required. The name of the Data Catalog resource to list the tags of. The resource
-  // could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
+  // Required. The name of the Data Catalog resource to list the tags of. The
+  // resource could be an [Entry][google.cloud.datacatalog.v1.Entry] or an
   // [EntryGroup][google.cloud.datacatalog.v1.EntryGroup].
   //
   // Examples:
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Datacatalog.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Datacatalog.java
index a323144c..76888ad7 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Datacatalog.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Datacatalog.java
@@ -305,7 +305,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + ".cloud.datacatalog.v1beta1.Entry\022\027\n\017next"
           + "_page_token\030\002 \001(\t*[\n\tEntryType\022\032\n\026ENTRY_"
           + "TYPE_UNSPECIFIED\020\000\022\t\n\005TABLE\020\002\022\t\n\005MODEL\020\005"
-          + "\022\017\n\013DATA_STREAM\020\003\022\013\n\007FILESET\020\0042\2372\n\013DataC"
+          + "\022\017\n\013DATA_STREAM\020\003\022\013\n\007FILESET\020\0042\2742\n\013DataC"
           + "atalog\022\262\001\n\rSearchCatalog\0226.google.cloud."
           + "datacatalog.v1beta1.SearchCatalogRequest"
           + "\0327.google.cloud.datacatalog.v1beta1.Sear"
@@ -441,38 +441,39 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "parent=projects/*/locations/*/entryGroup"
           + "s/*/entries/*}/tagsZ=\022;/v1beta1/{parent="
           + "projects/*/locations/*/entryGroups/*}/ta"
-          + "gs\332A\006parent\022\352\001\n\014SetIamPolicy\022\".google.ia"
+          + "gs\332A\006parent\022\374\001\n\014SetIamPolicy\022\".google.ia"
           + "m.v1.SetIamPolicyRequest\032\025.google.iam.v1"
-          + ".Policy\"\236\001\202\323\344\223\002\227\001\"F/v1beta1/{resource=pr"
+          + ".Policy\"\260\001\202\323\344\223\002\227\001\"F/v1beta1/{resource=pr"
           + "ojects/*/locations/*/tagTemplates/*}:set"
           + "IamPolicy:\001*ZJ\"E/v1beta1/{resource=proje"
           + "cts/*/locations/*/entryGroups/*}:setIamP"
-          + "olicy:\001*\022\300\002\n\014GetIamPolicy\022\".google.iam.v"
-          + "1.GetIamPolicyRequest\032\025.google.iam.v1.Po"
-          + "licy\"\364\001\202\323\344\223\002\355\001\"F/v1beta1/{resource=proje"
-          + "cts/*/locations/*/tagTemplates/*}:getIam"
-          + "Policy:\001*ZJ\"E/v1beta1/{resource=projects"
-          + "/*/locations/*/entryGroups/*}:getIamPoli"
-          + "cy:\001*ZT\"O/v1beta1/{resource=projects/*/l"
-          + "ocations/*/entryGroups/*/entries/*}:getI"
-          + "amPolicy:\001*\022\362\002\n\022TestIamPermissions\022(.goo"
-          + "gle.iam.v1.TestIamPermissionsRequest\032).g"
-          + "oogle.iam.v1.TestIamPermissionsResponse\""
-          + "\206\002\202\323\344\223\002\377\001\"L/v1beta1/{resource=projects/*"
-          + "/locations/*/tagTemplates/*}:testIamPerm"
-          + "issions:\001*ZP\"K/v1beta1/{resource=project"
-          + "s/*/locations/*/entryGroups/*}:testIamPe"
-          + "rmissions:\001*ZZ\"U/v1beta1/{resource=proje"
-          + "cts/*/locations/*/entryGroups/*/entries/"
-          + "*}:testIamPermissions:\001*\032N\312A\032datacatalog"
-          + ".googleapis.com\322A.https://www.googleapis"
-          + ".com/auth/cloud-platformB\344\001\n$com.google."
-          + "cloud.datacatalog.v1beta1P\001ZKgoogle.gola"
-          + "ng.org/genproto/googleapis/cloud/datacat"
-          + "alog/v1beta1;datacatalog\370\001\001\252\002 Google.Clo"
-          + "ud.DataCatalog.V1Beta1\312\002 Google\\Cloud\\Da"
-          + "taCatalog\\V1beta1\352\002#Google::Cloud::DataC"
-          + "atalog::V1beta1b\006proto3"
+          + "olicy:\001*\332A\017resource,policy\022\313\002\n\014GetIamPol"
+          + "icy\022\".google.iam.v1.GetIamPolicyRequest\032"
+          + "\025.google.iam.v1.Policy\"\377\001\202\323\344\223\002\355\001\"F/v1bet"
+          + "a1/{resource=projects/*/locations/*/tagT"
+          + "emplates/*}:getIamPolicy:\001*ZJ\"E/v1beta1/"
+          + "{resource=projects/*/locations/*/entryGr"
+          + "oups/*}:getIamPolicy:\001*ZT\"O/v1beta1/{res"
+          + "ource=projects/*/locations/*/entryGroups"
+          + "/*/entries/*}:getIamPolicy:\001*\332A\010resource"
+          + "\022\362\002\n\022TestIamPermissions\022(.google.iam.v1."
+          + "TestIamPermissionsRequest\032).google.iam.v"
+          + "1.TestIamPermissionsResponse\"\206\002\202\323\344\223\002\377\001\"L"
+          + "/v1beta1/{resource=projects/*/locations/"
+          + "*/tagTemplates/*}:testIamPermissions:\001*Z"
+          + "P\"K/v1beta1/{resource=projects/*/locatio"
+          + "ns/*/entryGroups/*}:testIamPermissions:\001"
+          + "*ZZ\"U/v1beta1/{resource=projects/*/locat"
+          + "ions/*/entryGroups/*/entries/*}:testIamP"
+          + "ermissions:\001*\032N\312A\032datacatalog.googleapis"
+          + ".com\322A.https://www.googleapis.com/auth/c"
+          + "loud-platformB\344\001\n$com.google.cloud.datac"
+          + "atalog.v1beta1P\001ZKgoogle.golang.org/genp"
+          + "roto/googleapis/cloud/datacatalog/v1beta"
+          + "1;datacatalog\370\001\001\252\002 Google.Cloud.DataCata"
+          + "log.V1Beta1\312\002 Google\\Cloud\\DataCatalog\\V"
+          + "1beta1\352\002#Google::Cloud::DataCatalog::V1b"
+          + "eta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagName.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagName.java
new file mode 100644
index 00000000..a677b7b7
--- /dev/null
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagName.java
@@ -0,0 +1,243 @@
+/*
+ * 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.cloud.datacatalog.v1beta1;
+
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** AUTO-GENERATED DOCUMENTATION AND CLASS */
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class PolicyTagName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/taxonomies/{taxonomy}/policyTags/{policy_tag}");
+
+  private volatile Map<String, String> fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String taxonomy;
+  private final String policyTag;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getTaxonomy() {
+    return taxonomy;
+  }
+
+  public String getPolicyTag() {
+    return policyTag;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private PolicyTagName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    taxonomy = Preconditions.checkNotNull(builder.getTaxonomy());
+    policyTag = Preconditions.checkNotNull(builder.getPolicyTag());
+  }
+
+  public static PolicyTagName of(
+      String project, String location, String taxonomy, String policyTag) {
+    return newBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setTaxonomy(taxonomy)
+        .setPolicyTag(policyTag)
+        .build();
+  }
+
+  public static String format(String project, String location, String taxonomy, String policyTag) {
+    return newBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setTaxonomy(taxonomy)
+        .setPolicyTag(policyTag)
+        .build()
+        .toString();
+  }
+
+  public static PolicyTagName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map<String, String> matchMap =
+        PATH_TEMPLATE.validatedMatch(
+            formattedString, "PolicyTagName.parse: formattedString not in valid format");
+    return of(
+        matchMap.get("project"),
+        matchMap.get("location"),
+        matchMap.get("taxonomy"),
+        matchMap.get("policy_tag"));
+  }
+
+  public static List<PolicyTagName> parseList(List<String> formattedStrings) {
+    List<PolicyTagName> list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List<String> toStringList(List<PolicyTagName> values) {
+    List<String> list = new ArrayList<String>(values.size());
+    for (PolicyTagName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map<String, String> getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("taxonomy", taxonomy);
+          fieldMapBuilder.put("policyTag", policyTag);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate(
+        "project", project, "location", location, "taxonomy", taxonomy, "policy_tag", policyTag);
+  }
+
+  /** Builder for PolicyTagName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String taxonomy;
+    private String policyTag;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getTaxonomy() {
+      return taxonomy;
+    }
+
+    public String getPolicyTag() {
+      return policyTag;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setTaxonomy(String taxonomy) {
+      this.taxonomy = taxonomy;
+      return this;
+    }
+
+    public Builder setPolicyTag(String policyTag) {
+      this.policyTag = policyTag;
+      return this;
+    }
+
+    private Builder() {}
+
+    private Builder(PolicyTagName policyTagName) {
+      project = policyTagName.project;
+      location = policyTagName.location;
+      taxonomy = policyTagName.taxonomy;
+      policyTag = policyTagName.policyTag;
+    }
+
+    public PolicyTagName build() {
+      return new PolicyTagName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof PolicyTagName) {
+      PolicyTagName that = (PolicyTagName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.taxonomy.equals(that.taxonomy))
+          && (this.policyTag.equals(that.policyTag));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= taxonomy.hashCode();
+    h *= 1000003;
+    h ^= policyTag.hashCode();
+    return h;
+  }
+}
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateFieldName.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateFieldName.java
new file mode 100644
index 00000000..fd9456ec
--- /dev/null
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateFieldName.java
@@ -0,0 +1,243 @@
+/*
+ * 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.cloud.datacatalog.v1beta1;
+
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** AUTO-GENERATED DOCUMENTATION AND CLASS */
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class TagTemplateFieldName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/tagTemplates/{tag_template}/fields/{field}");
+
+  private volatile Map<String, String> fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String tagTemplate;
+  private final String field;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getTagTemplate() {
+    return tagTemplate;
+  }
+
+  public String getField() {
+    return field;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private TagTemplateFieldName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    tagTemplate = Preconditions.checkNotNull(builder.getTagTemplate());
+    field = Preconditions.checkNotNull(builder.getField());
+  }
+
+  public static TagTemplateFieldName of(
+      String project, String location, String tagTemplate, String field) {
+    return newBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setTagTemplate(tagTemplate)
+        .setField(field)
+        .build();
+  }
+
+  public static String format(String project, String location, String tagTemplate, String field) {
+    return newBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setTagTemplate(tagTemplate)
+        .setField(field)
+        .build()
+        .toString();
+  }
+
+  public static TagTemplateFieldName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map<String, String> matchMap =
+        PATH_TEMPLATE.validatedMatch(
+            formattedString, "TagTemplateFieldName.parse: formattedString not in valid format");
+    return of(
+        matchMap.get("project"),
+        matchMap.get("location"),
+        matchMap.get("tag_template"),
+        matchMap.get("field"));
+  }
+
+  public static List<TagTemplateFieldName> parseList(List<String> formattedStrings) {
+    List<TagTemplateFieldName> list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List<String> toStringList(List<TagTemplateFieldName> values) {
+    List<String> list = new ArrayList<String>(values.size());
+    for (TagTemplateFieldName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map<String, String> getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("tagTemplate", tagTemplate);
+          fieldMapBuilder.put("field", field);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate(
+        "project", project, "location", location, "tag_template", tagTemplate, "field", field);
+  }
+
+  /** Builder for TagTemplateFieldName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String tagTemplate;
+    private String field;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getTagTemplate() {
+      return tagTemplate;
+    }
+
+    public String getField() {
+      return field;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setTagTemplate(String tagTemplate) {
+      this.tagTemplate = tagTemplate;
+      return this;
+    }
+
+    public Builder setField(String field) {
+      this.field = field;
+      return this;
+    }
+
+    private Builder() {}
+
+    private Builder(TagTemplateFieldName tagTemplateFieldName) {
+      project = tagTemplateFieldName.project;
+      location = tagTemplateFieldName.location;
+      tagTemplate = tagTemplateFieldName.tagTemplate;
+      field = tagTemplateFieldName.field;
+    }
+
+    public TagTemplateFieldName build() {
+      return new TagTemplateFieldName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof TagTemplateFieldName) {
+      TagTemplateFieldName that = (TagTemplateFieldName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.tagTemplate.equals(that.tagTemplate))
+          && (this.field.equals(that.field));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= tagTemplate.hashCode();
+    h *= 1000003;
+    h ^= field.hashCode();
+    return h;
+  }
+}
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TaxonomyName.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TaxonomyName.java
new file mode 100644
index 00000000..4609290a
--- /dev/null
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TaxonomyName.java
@@ -0,0 +1,211 @@
+/*
+ * 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.cloud.datacatalog.v1beta1;
+
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** AUTO-GENERATED DOCUMENTATION AND CLASS */
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class TaxonomyName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/taxonomies/{taxonomy}");
+
+  private volatile Map<String, String> fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String taxonomy;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getTaxonomy() {
+    return taxonomy;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private TaxonomyName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    taxonomy = Preconditions.checkNotNull(builder.getTaxonomy());
+  }
+
+  public static TaxonomyName of(String project, String location, String taxonomy) {
+    return newBuilder().setProject(project).setLocation(location).setTaxonomy(taxonomy).build();
+  }
+
+  public static String format(String project, String location, String taxonomy) {
+    return newBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setTaxonomy(taxonomy)
+        .build()
+        .toString();
+  }
+
+  public static TaxonomyName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map<String, String> matchMap =
+        PATH_TEMPLATE.validatedMatch(
+            formattedString, "TaxonomyName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("taxonomy"));
+  }
+
+  public static List<TaxonomyName> parseList(List<String> formattedStrings) {
+    List<TaxonomyName> list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List<String> toStringList(List<TaxonomyName> values) {
+    List<String> list = new ArrayList<String>(values.size());
+    for (TaxonomyName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map<String, String> getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("taxonomy", taxonomy);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate(
+        "project", project, "location", location, "taxonomy", taxonomy);
+  }
+
+  /** Builder for TaxonomyName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String taxonomy;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getTaxonomy() {
+      return taxonomy;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setTaxonomy(String taxonomy) {
+      this.taxonomy = taxonomy;
+      return this;
+    }
+
+    private Builder() {}
+
+    private Builder(TaxonomyName taxonomyName) {
+      project = taxonomyName.project;
+      location = taxonomyName.location;
+      taxonomy = taxonomyName.taxonomy;
+    }
+
+    public TaxonomyName build() {
+      return new TaxonomyName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof TaxonomyName) {
+      TaxonomyName that = (TaxonomyName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.taxonomy.equals(that.taxonomy));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= taxonomy.hashCode();
+    return h;
+  }
+}
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/proto/google/cloud/datacatalog/v1beta1/datacatalog.proto b/proto-google-cloud-datacatalog-v1beta1/src/main/proto/google/cloud/datacatalog/v1beta1/datacatalog.proto
index 10a9bb75..038e2203 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/proto/google/cloud/datacatalog/v1beta1/datacatalog.proto
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/proto/google/cloud/datacatalog/v1beta1/datacatalog.proto
@@ -377,6 +377,8 @@ service DataCatalog {
         body: "*"
       }
     };
+
+    option (google.api.method_signature) = "resource,policy";
   }
 
   // Gets the access control policy for a resource. A `NOT_FOUND` error
@@ -408,6 +410,7 @@ service DataCatalog {
         body: "*"
       }
     };
+    option (google.api.method_signature) = "resource";
   }
 
   // Returns the caller's permissions on a resource.
diff --git a/synth.metadata b/synth.metadata
index 313b92fe..5cae7713 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,16 +11,16 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "e0f9d9e1f9de890db765be46f45ca8490723e3eb",
-        "internalRef": "309824146"
+        "sha": "684dfea7decfeca7a7526ea96a8e9256694dd5d8",
+        "internalRef": "310415142"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "e0f9d9e1f9de890db765be46f45ca8490723e3eb",
-        "internalRef": "309824146"
+        "sha": "684dfea7decfeca7a7526ea96a8e9256694dd5d8",
+        "internalRef": "310415142"
       }
     },
     {

From f3f6c0d15ad9fe80b89fbe017fec4246388497bb Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 3 Jun 2020 17:07:49 -0700
Subject: [PATCH 3/5] bazel: update protobuf, rules_go, gazelle, and
 gapic-generator-go versions - 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 <noreply@google.com>
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
---
 .../v1/BigQueryDateShardedSpec.java           |  6 +++
 .../datacatalog/v1/BigQueryTableSpec.java     | 17 ++++++++
 .../cloud/datacatalog/v1/ColumnSchema.java    | 13 ++++++
 .../v1/CreateEntryGroupRequest.java           |  7 ++++
 .../datacatalog/v1/CreateEntryRequest.java    |  7 ++++
 .../datacatalog/v1/CreateTagRequest.java      |  5 +++
 .../v1/CreateTagTemplateFieldRequest.java     |  7 ++++
 .../v1/CreateTagTemplateRequest.java          |  7 ++++
 .../v1/DeleteEntryGroupRequest.java           |  4 ++
 .../datacatalog/v1/DeleteEntryRequest.java    |  2 +
 .../datacatalog/v1/DeleteTagRequest.java      |  2 +
 .../v1/DeleteTagTemplateFieldRequest.java     |  4 ++
 .../v1/DeleteTagTemplateRequest.java          |  4 ++
 .../google/cloud/datacatalog/v1/Entry.java    | 40 +++++++++++++++++++
 .../cloud/datacatalog/v1/EntryGroup.java      |  9 +++++
 .../cloud/datacatalog/v1/EntryType.java       |  4 ++
 .../cloud/datacatalog/v1/FieldType.java       | 19 +++++++++
 .../cloud/datacatalog/v1/GcsFileSpec.java     |  7 ++++
 .../cloud/datacatalog/v1/GcsFilesetSpec.java  |  5 +++
 .../datacatalog/v1/GetEntryGroupRequest.java  |  5 +++
 .../cloud/datacatalog/v1/GetEntryRequest.java |  2 +
 .../datacatalog/v1/GetTagTemplateRequest.java |  2 +
 .../datacatalog/v1/IntegratedSystem.java      |  4 ++
 .../datacatalog/v1/ListEntriesRequest.java    |  9 +++++
 .../datacatalog/v1/ListEntriesResponse.java   |  7 ++++
 .../v1/ListEntryGroupsRequest.java            |  6 +++
 .../v1/ListEntryGroupsResponse.java           |  7 ++++
 .../cloud/datacatalog/v1/ListTagsRequest.java |  6 +++
 .../datacatalog/v1/ListTagsResponse.java      |  7 ++++
 .../datacatalog/v1/LookupEntryRequest.java    |  4 ++
 .../v1/RenameTagTemplateFieldRequest.java     |  4 ++
 .../google/cloud/datacatalog/v1/Schema.java   |  5 +++
 .../datacatalog/v1/SearchCatalogRequest.java  | 13 ++++++
 .../datacatalog/v1/SearchCatalogResponse.java |  7 ++++
 .../datacatalog/v1/SearchCatalogResult.java   | 15 +++++++
 .../datacatalog/v1/SearchResultType.java      |  4 ++
 .../datacatalog/v1/SystemTimestamps.java      |  9 +++++
 .../cloud/datacatalog/v1/TableSourceType.java |  4 ++
 .../cloud/datacatalog/v1/TableSpec.java       |  2 +
 .../com/google/cloud/datacatalog/v1/Tag.java  | 18 +++++++++
 .../google/cloud/datacatalog/v1/TagField.java | 22 ++++++++++
 .../cloud/datacatalog/v1/TagTemplate.java     | 14 +++++++
 .../datacatalog/v1/TagTemplateField.java      | 11 +++++
 .../v1/UpdateEntryGroupRequest.java           |  6 +++
 .../datacatalog/v1/UpdateEntryRequest.java    |  6 +++
 .../datacatalog/v1/UpdateTagRequest.java      |  6 +++
 .../v1/UpdateTagTemplateFieldRequest.java     |  8 ++++
 .../v1/UpdateTagTemplateRequest.java          |  6 +++
 .../google/cloud/datacatalog/v1/ViewSpec.java |  2 +
 .../v1beta1/BigQueryDateShardedSpec.java      |  6 +++
 .../v1beta1/BigQueryTableSpec.java            | 17 ++++++++
 .../datacatalog/v1beta1/ColumnSchema.java     | 13 ++++++
 .../v1beta1/CreateEntryGroupRequest.java      |  7 ++++
 .../v1beta1/CreateEntryRequest.java           |  7 ++++
 .../v1beta1/CreatePolicyTagRequest.java       |  5 +++
 .../datacatalog/v1beta1/CreateTagRequest.java |  5 +++
 .../CreateTagTemplateFieldRequest.java        |  7 ++++
 .../v1beta1/CreateTagTemplateRequest.java     |  7 ++++
 .../v1beta1/CreateTaxonomyRequest.java        |  5 +++
 .../v1beta1/DeleteEntryGroupRequest.java      |  4 ++
 .../v1beta1/DeleteEntryRequest.java           |  2 +
 .../v1beta1/DeletePolicyTagRequest.java       |  2 +
 .../datacatalog/v1beta1/DeleteTagRequest.java |  2 +
 .../DeleteTagTemplateFieldRequest.java        |  4 ++
 .../v1beta1/DeleteTagTemplateRequest.java     |  4 ++
 .../v1beta1/DeleteTaxonomyRequest.java        |  2 +
 .../cloud/datacatalog/v1beta1/Entry.java      | 40 +++++++++++++++++++
 .../cloud/datacatalog/v1beta1/EntryGroup.java |  9 +++++
 .../cloud/datacatalog/v1beta1/EntryType.java  |  4 ++
 .../v1beta1/ExportTaxonomiesRequest.java      |  3 ++
 .../v1beta1/ExportTaxonomiesResponse.java     |  5 +++
 .../cloud/datacatalog/v1beta1/FieldType.java  | 19 +++++++++
 .../datacatalog/v1beta1/GcsFileSpec.java      |  7 ++++
 .../datacatalog/v1beta1/GcsFilesetSpec.java   |  5 +++
 .../v1beta1/GetEntryGroupRequest.java         |  5 +++
 .../datacatalog/v1beta1/GetEntryRequest.java  |  2 +
 .../v1beta1/GetPolicyTagRequest.java          |  2 +
 .../v1beta1/GetTagTemplateRequest.java        |  2 +
 .../v1beta1/GetTaxonomyRequest.java           |  2 +
 .../v1beta1/ImportTaxonomiesRequest.java      |  8 ++++
 .../v1beta1/ImportTaxonomiesResponse.java     |  5 +++
 .../datacatalog/v1beta1/InlineSource.java     |  5 +++
 .../datacatalog/v1beta1/IntegratedSystem.java |  4 ++
 .../v1beta1/ListEntriesRequest.java           |  9 +++++
 .../v1beta1/ListEntriesResponse.java          |  7 ++++
 .../v1beta1/ListEntryGroupsRequest.java       |  6 +++
 .../v1beta1/ListEntryGroupsResponse.java      |  7 ++++
 .../v1beta1/ListPolicyTagsRequest.java        |  6 +++
 .../v1beta1/ListPolicyTagsResponse.java       |  7 ++++
 .../datacatalog/v1beta1/ListTagsRequest.java  |  6 +++
 .../datacatalog/v1beta1/ListTagsResponse.java |  7 ++++
 .../v1beta1/ListTaxonomiesRequest.java        |  6 +++
 .../v1beta1/ListTaxonomiesResponse.java       |  7 ++++
 .../v1beta1/LookupEntryRequest.java           |  4 ++
 .../cloud/datacatalog/v1beta1/PolicyTag.java  |  8 ++++
 .../RenameTagTemplateFieldRequest.java        |  4 ++
 .../cloud/datacatalog/v1beta1/Schema.java     |  5 +++
 .../v1beta1/SearchCatalogRequest.java         | 13 ++++++
 .../v1beta1/SearchCatalogResponse.java        |  7 ++++
 .../v1beta1/SearchCatalogResult.java          | 11 +++++
 .../datacatalog/v1beta1/SearchResultType.java |  4 ++
 .../v1beta1/SerializedPolicyTag.java          |  9 +++++
 .../v1beta1/SerializedTaxonomy.java           |  9 +++++
 .../datacatalog/v1beta1/SystemTimestamps.java |  9 +++++
 .../datacatalog/v1beta1/TableSourceType.java  |  4 ++
 .../cloud/datacatalog/v1beta1/TableSpec.java  |  2 +
 .../google/cloud/datacatalog/v1beta1/Tag.java | 18 +++++++++
 .../cloud/datacatalog/v1beta1/TagField.java   | 22 ++++++++++
 .../datacatalog/v1beta1/TagTemplate.java      | 14 +++++++
 .../datacatalog/v1beta1/TagTemplateField.java | 11 +++++
 .../cloud/datacatalog/v1beta1/Taxonomy.java   | 15 +++++++
 .../v1beta1/UpdateEntryGroupRequest.java      |  6 +++
 .../v1beta1/UpdateEntryRequest.java           |  6 +++
 .../v1beta1/UpdatePolicyTagRequest.java       |  6 +++
 .../datacatalog/v1beta1/UpdateTagRequest.java |  6 +++
 .../UpdateTagTemplateFieldRequest.java        |  8 ++++
 .../v1beta1/UpdateTagTemplateRequest.java     |  6 +++
 .../v1beta1/UpdateTaxonomyRequest.java        |  6 +++
 .../cloud/datacatalog/v1beta1/ViewSpec.java   |  2 +
 synth.metadata                                | 10 ++---
 120 files changed, 904 insertions(+), 5 deletions(-)

diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryDateShardedSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryDateShardedSpec.java
index c1de0004..4c8e2004 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryDateShardedSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryDateShardedSpec.java
@@ -143,6 +143,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The dataset.
    */
+  @java.lang.Override
   public java.lang.String getDataset() {
     java.lang.Object ref = dataset_;
     if (ref instanceof java.lang.String) {
@@ -169,6 +170,7 @@ public java.lang.String getDataset() {
    *
    * @return The bytes for dataset.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDatasetBytes() {
     java.lang.Object ref = dataset_;
     if (ref instanceof java.lang.String) {
@@ -196,6 +198,7 @@ public com.google.protobuf.ByteString getDatasetBytes() {
    *
    * @return The tablePrefix.
    */
+  @java.lang.Override
   public java.lang.String getTablePrefix() {
     java.lang.Object ref = tablePrefix_;
     if (ref instanceof java.lang.String) {
@@ -220,6 +223,7 @@ public java.lang.String getTablePrefix() {
    *
    * @return The bytes for tablePrefix.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTablePrefixBytes() {
     java.lang.Object ref = tablePrefix_;
     if (ref instanceof java.lang.String) {
@@ -245,6 +249,7 @@ public com.google.protobuf.ByteString getTablePrefixBytes() {
    *
    * @return The shardCount.
    */
+  @java.lang.Override
   public long getShardCount() {
     return shardCount_;
   }
@@ -855,6 +860,7 @@ public Builder setTablePrefixBytes(com.google.protobuf.ByteString value) {
      *
      * @return The shardCount.
      */
+    @java.lang.Override
     public long getShardCount() {
       return shardCount_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryTableSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryTableSpec.java
index f70269a5..729a9631 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryTableSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/BigQueryTableSpec.java
@@ -205,6 +205,7 @@ public TypeSpecCase getTypeSpecCase() {
    *
    * @return The enum numeric value on the wire for tableSourceType.
    */
+  @java.lang.Override
   public int getTableSourceTypeValue() {
     return tableSourceType_;
   }
@@ -221,6 +222,7 @@ public int getTableSourceTypeValue() {
    *
    * @return The tableSourceType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TableSourceType getTableSourceType() {
     @SuppressWarnings("deprecation")
     com.google.cloud.datacatalog.v1.TableSourceType result =
@@ -241,6 +243,7 @@ public com.google.cloud.datacatalog.v1.TableSourceType getTableSourceType() {
    *
    * @return Whether the viewSpec field is set.
    */
+  @java.lang.Override
   public boolean hasViewSpec() {
     return typeSpecCase_ == 2;
   }
@@ -256,6 +259,7 @@ public boolean hasViewSpec() {
    *
    * @return The viewSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ViewSpec getViewSpec() {
     if (typeSpecCase_ == 2) {
       return (com.google.cloud.datacatalog.v1.ViewSpec) typeSpec_;
@@ -272,6 +276,7 @@ public com.google.cloud.datacatalog.v1.ViewSpec getViewSpec() {
    *
    * <code>.google.cloud.datacatalog.v1.ViewSpec view_spec = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ViewSpecOrBuilder getViewSpecOrBuilder() {
     if (typeSpecCase_ == 2) {
       return (com.google.cloud.datacatalog.v1.ViewSpec) typeSpec_;
@@ -292,6 +297,7 @@ public com.google.cloud.datacatalog.v1.ViewSpecOrBuilder getViewSpecOrBuilder()
    *
    * @return Whether the tableSpec field is set.
    */
+  @java.lang.Override
   public boolean hasTableSpec() {
     return typeSpecCase_ == 3;
   }
@@ -307,6 +313,7 @@ public boolean hasTableSpec() {
    *
    * @return The tableSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TableSpec getTableSpec() {
     if (typeSpecCase_ == 3) {
       return (com.google.cloud.datacatalog.v1.TableSpec) typeSpec_;
@@ -323,6 +330,7 @@ public com.google.cloud.datacatalog.v1.TableSpec getTableSpec() {
    *
    * <code>.google.cloud.datacatalog.v1.TableSpec table_spec = 3;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TableSpecOrBuilder getTableSpecOrBuilder() {
     if (typeSpecCase_ == 3) {
       return (com.google.cloud.datacatalog.v1.TableSpec) typeSpec_;
@@ -751,6 +759,7 @@ public Builder clearTypeSpec() {
      *
      * @return The enum numeric value on the wire for tableSourceType.
      */
+    @java.lang.Override
     public int getTableSourceTypeValue() {
       return tableSourceType_;
     }
@@ -769,6 +778,7 @@ public int getTableSourceTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTableSourceTypeValue(int value) {
+
       tableSourceType_ = value;
       onChanged();
       return this;
@@ -786,6 +796,7 @@ public Builder setTableSourceTypeValue(int value) {
      *
      * @return The tableSourceType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TableSourceType getTableSourceType() {
       @SuppressWarnings("deprecation")
       com.google.cloud.datacatalog.v1.TableSourceType result =
@@ -852,6 +863,7 @@ public Builder clearTableSourceType() {
      *
      * @return Whether the viewSpec field is set.
      */
+    @java.lang.Override
     public boolean hasViewSpec() {
       return typeSpecCase_ == 2;
     }
@@ -867,6 +879,7 @@ public boolean hasViewSpec() {
      *
      * @return The viewSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.ViewSpec getViewSpec() {
       if (viewSpecBuilder_ == null) {
         if (typeSpecCase_ == 2) {
@@ -1004,6 +1017,7 @@ public com.google.cloud.datacatalog.v1.ViewSpec.Builder getViewSpecBuilder() {
      *
      * <code>.google.cloud.datacatalog.v1.ViewSpec view_spec = 2;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.ViewSpecOrBuilder getViewSpecOrBuilder() {
       if ((typeSpecCase_ == 2) && (viewSpecBuilder_ != null)) {
         return viewSpecBuilder_.getMessageOrBuilder();
@@ -1066,6 +1080,7 @@ public com.google.cloud.datacatalog.v1.ViewSpecOrBuilder getViewSpecOrBuilder()
      *
      * @return Whether the tableSpec field is set.
      */
+    @java.lang.Override
     public boolean hasTableSpec() {
       return typeSpecCase_ == 3;
     }
@@ -1081,6 +1096,7 @@ public boolean hasTableSpec() {
      *
      * @return The tableSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TableSpec getTableSpec() {
       if (tableSpecBuilder_ == null) {
         if (typeSpecCase_ == 3) {
@@ -1218,6 +1234,7 @@ public com.google.cloud.datacatalog.v1.TableSpec.Builder getTableSpecBuilder() {
      *
      * <code>.google.cloud.datacatalog.v1.TableSpec table_spec = 3;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TableSpecOrBuilder getTableSpecOrBuilder() {
       if ((typeSpecCase_ == 3) && (tableSpecBuilder_ != null)) {
         return tableSpecBuilder_.getMessageOrBuilder();
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ColumnSchema.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ColumnSchema.java
index 27f002ec..44f169cb 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ColumnSchema.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ColumnSchema.java
@@ -166,6 +166,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The column.
    */
+  @java.lang.Override
   public java.lang.String getColumn() {
     java.lang.Object ref = column_;
     if (ref instanceof java.lang.String) {
@@ -188,6 +189,7 @@ public java.lang.String getColumn() {
    *
    * @return The bytes for column.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getColumnBytes() {
     java.lang.Object ref = column_;
     if (ref instanceof java.lang.String) {
@@ -213,6 +215,7 @@ public com.google.protobuf.ByteString getColumnBytes() {
    *
    * @return The type.
    */
+  @java.lang.Override
   public java.lang.String getType() {
     java.lang.Object ref = type_;
     if (ref instanceof java.lang.String) {
@@ -235,6 +238,7 @@ public java.lang.String getType() {
    *
    * @return The bytes for type.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTypeBytes() {
     java.lang.Object ref = type_;
     if (ref instanceof java.lang.String) {
@@ -260,6 +264,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -282,6 +287,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -309,6 +315,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return The mode.
    */
+  @java.lang.Override
   public java.lang.String getMode() {
     java.lang.Object ref = mode_;
     if (ref instanceof java.lang.String) {
@@ -333,6 +340,7 @@ public java.lang.String getMode() {
    *
    * @return The bytes for mode.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getModeBytes() {
     java.lang.Object ref = mode_;
     if (ref instanceof java.lang.String) {
@@ -358,6 +366,7 @@ public com.google.protobuf.ByteString getModeBytes() {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getSubcolumnsList() {
     return subcolumns_;
   }
@@ -372,6 +381,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getSubcolumn
    * repeated .google.cloud.datacatalog.v1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.ColumnSchemaOrBuilder>
       getSubcolumnsOrBuilderList() {
     return subcolumns_;
@@ -387,6 +397,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getSubcolumn
    * repeated .google.cloud.datacatalog.v1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public int getSubcolumnsCount() {
     return subcolumns_.size();
   }
@@ -401,6 +412,7 @@ public int getSubcolumnsCount() {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ColumnSchema getSubcolumns(int index) {
     return subcolumns_.get(index);
   }
@@ -415,6 +427,7 @@ public com.google.cloud.datacatalog.v1.ColumnSchema getSubcolumns(int index) {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ColumnSchemaOrBuilder getSubcolumnsOrBuilder(int index) {
     return subcolumns_.get(index);
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryGroupRequest.java
index 2482c121..5eae2de8 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryGroupRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -208,6 +210,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The entryGroupId.
    */
+  @java.lang.Override
   public java.lang.String getEntryGroupId() {
     java.lang.Object ref = entryGroupId_;
     if (ref instanceof java.lang.String) {
@@ -232,6 +235,7 @@ public java.lang.String getEntryGroupId() {
    *
    * @return The bytes for entryGroupId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEntryGroupIdBytes() {
     java.lang.Object ref = entryGroupId_;
     if (ref instanceof java.lang.String) {
@@ -257,6 +261,7 @@ public com.google.protobuf.ByteString getEntryGroupIdBytes() {
    *
    * @return Whether the entryGroup field is set.
    */
+  @java.lang.Override
   public boolean hasEntryGroup() {
     return entryGroup_ != null;
   }
@@ -271,6 +276,7 @@ public boolean hasEntryGroup() {
    *
    * @return The entryGroup.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroup() {
     return entryGroup_ == null
         ? com.google.cloud.datacatalog.v1.EntryGroup.getDefaultInstance()
@@ -285,6 +291,7 @@ public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroup() {
    *
    * <code>.google.cloud.datacatalog.v1.EntryGroup entry_group = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroupOrBuilder getEntryGroupOrBuilder() {
     return getEntryGroup();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryRequest.java
index dc526970..70c6c4ef 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateEntryRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -206,6 +208,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The entryId.
    */
+  @java.lang.Override
   public java.lang.String getEntryId() {
     java.lang.Object ref = entryId_;
     if (ref instanceof java.lang.String) {
@@ -228,6 +231,7 @@ public java.lang.String getEntryId() {
    *
    * @return The bytes for entryId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEntryIdBytes() {
     java.lang.Object ref = entryId_;
     if (ref instanceof java.lang.String) {
@@ -254,6 +258,7 @@ public com.google.protobuf.ByteString getEntryIdBytes() {
    *
    * @return Whether the entry field is set.
    */
+  @java.lang.Override
   public boolean hasEntry() {
     return entry_ != null;
   }
@@ -269,6 +274,7 @@ public boolean hasEntry() {
    *
    * @return The entry.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Entry getEntry() {
     return entry_ == null ? com.google.cloud.datacatalog.v1.Entry.getDefaultInstance() : entry_;
   }
@@ -282,6 +288,7 @@ public com.google.cloud.datacatalog.v1.Entry getEntry() {
    * <code>.google.cloud.datacatalog.v1.Entry entry = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryOrBuilder getEntryOrBuilder() {
     return getEntry();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
index 715465c5..7d7b9b66 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagRequest.java
@@ -147,6 +147,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -175,6 +176,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -201,6 +203,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return Whether the tag field is set.
    */
+  @java.lang.Override
   public boolean hasTag() {
     return tag_ != null;
   }
@@ -216,6 +219,7 @@ public boolean hasTag() {
    *
    * @return The tag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Tag getTag() {
     return tag_ == null ? com.google.cloud.datacatalog.v1.Tag.getDefaultInstance() : tag_;
   }
@@ -229,6 +233,7 @@ public com.google.cloud.datacatalog.v1.Tag getTag() {
    * <code>.google.cloud.datacatalog.v1.Tag tag = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagOrBuilder getTagOrBuilder() {
     return getTag();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateFieldRequest.java
index 6e2f8166..aaa1c40f 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateFieldRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -210,6 +212,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The tagTemplateFieldId.
    */
+  @java.lang.Override
   public java.lang.String getTagTemplateFieldId() {
     java.lang.Object ref = tagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -236,6 +239,7 @@ public java.lang.String getTagTemplateFieldId() {
    *
    * @return The bytes for tagTemplateFieldId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTagTemplateFieldIdBytes() {
     java.lang.Object ref = tagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -263,6 +267,7 @@ public com.google.protobuf.ByteString getTagTemplateFieldIdBytes() {
    *
    * @return Whether the tagTemplateField field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplateField() {
     return tagTemplateField_ != null;
   }
@@ -279,6 +284,7 @@ public boolean hasTagTemplateField() {
    *
    * @return The tagTemplateField.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateField getTagTemplateField() {
     return tagTemplateField_ == null
         ? com.google.cloud.datacatalog.v1.TagTemplateField.getDefaultInstance()
@@ -295,6 +301,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateField getTagTemplateField() {
    * .google.cloud.datacatalog.v1.TagTemplateField tag_template_field = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateFieldOrBuilder getTagTemplateFieldOrBuilder() {
     return getTagTemplateField();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateRequest.java
index 74ccaebc..32464411 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/CreateTagTemplateRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -206,6 +208,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The tagTemplateId.
    */
+  @java.lang.Override
   public java.lang.String getTagTemplateId() {
     java.lang.Object ref = tagTemplateId_;
     if (ref instanceof java.lang.String) {
@@ -228,6 +231,7 @@ public java.lang.String getTagTemplateId() {
    *
    * @return The bytes for tagTemplateId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTagTemplateIdBytes() {
     java.lang.Object ref = tagTemplateId_;
     if (ref instanceof java.lang.String) {
@@ -255,6 +259,7 @@ public com.google.protobuf.ByteString getTagTemplateIdBytes() {
    *
    * @return Whether the tagTemplate field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplate() {
     return tagTemplate_ != null;
   }
@@ -271,6 +276,7 @@ public boolean hasTagTemplate() {
    *
    * @return The tagTemplate.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplate getTagTemplate() {
     return tagTemplate_ == null
         ? com.google.cloud.datacatalog.v1.TagTemplate.getDefaultInstance()
@@ -287,6 +293,7 @@ public com.google.cloud.datacatalog.v1.TagTemplate getTagTemplate() {
    * .google.cloud.datacatalog.v1.TagTemplate tag_template = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateOrBuilder getTagTemplateOrBuilder() {
     return getTagTemplate();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryGroupRequest.java
index 3b0e79cd..05ea0532 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryGroupRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -183,6 +185,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -655,6 +658,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryRequest.java
index dcbdaaae..989c302b 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteEntryRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagRequest.java
index 220b1502..0f376206 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateFieldRequest.java
index a1d19549..c2a2f2a4 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateFieldRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -185,6 +187,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -662,6 +665,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateRequest.java
index ad669523..0ea7af14 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DeleteTagTemplateRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -185,6 +187,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -659,6 +662,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
index cb74a16d..80d98f13 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Entry.java
@@ -418,6 +418,7 @@ public TypeSpecCase getTypeSpecCase() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -443,6 +444,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) {
@@ -476,6 +478,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The linkedResource.
    */
+  @java.lang.Override
   public java.lang.String getLinkedResource() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -506,6 +509,7 @@ public java.lang.String getLinkedResource() {
    *
    * @return The bytes for linkedResource.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getLinkedResourceBytes() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -755,6 +759,7 @@ public com.google.protobuf.ByteString getUserSpecifiedSystemBytes() {
    *
    * @return Whether the gcsFilesetSpec field is set.
    */
+  @java.lang.Override
   public boolean hasGcsFilesetSpec() {
     return typeSpecCase_ == 6;
   }
@@ -770,6 +775,7 @@ public boolean hasGcsFilesetSpec() {
    *
    * @return The gcsFilesetSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.GcsFilesetSpec getGcsFilesetSpec() {
     if (typeSpecCase_ == 6) {
       return (com.google.cloud.datacatalog.v1.GcsFilesetSpec) typeSpec_;
@@ -786,6 +792,7 @@ public com.google.cloud.datacatalog.v1.GcsFilesetSpec getGcsFilesetSpec() {
    *
    * <code>.google.cloud.datacatalog.v1.GcsFilesetSpec gcs_fileset_spec = 6;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.GcsFilesetSpecOrBuilder getGcsFilesetSpecOrBuilder() {
     if (typeSpecCase_ == 6) {
       return (com.google.cloud.datacatalog.v1.GcsFilesetSpec) typeSpec_;
@@ -806,6 +813,7 @@ public com.google.cloud.datacatalog.v1.GcsFilesetSpecOrBuilder getGcsFilesetSpec
    *
    * @return Whether the bigqueryTableSpec field is set.
    */
+  @java.lang.Override
   public boolean hasBigqueryTableSpec() {
     return typeSpecCase_ == 12;
   }
@@ -821,6 +829,7 @@ public boolean hasBigqueryTableSpec() {
    *
    * @return The bigqueryTableSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.BigQueryTableSpec getBigqueryTableSpec() {
     if (typeSpecCase_ == 12) {
       return (com.google.cloud.datacatalog.v1.BigQueryTableSpec) typeSpec_;
@@ -837,6 +846,7 @@ public com.google.cloud.datacatalog.v1.BigQueryTableSpec getBigqueryTableSpec()
    *
    * <code>.google.cloud.datacatalog.v1.BigQueryTableSpec bigquery_table_spec = 12;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.BigQueryTableSpecOrBuilder
       getBigqueryTableSpecOrBuilder() {
     if (typeSpecCase_ == 12) {
@@ -860,6 +870,7 @@ public com.google.cloud.datacatalog.v1.BigQueryTableSpec getBigqueryTableSpec()
    *
    * @return Whether the bigqueryDateShardedSpec field is set.
    */
+  @java.lang.Override
   public boolean hasBigqueryDateShardedSpec() {
     return typeSpecCase_ == 15;
   }
@@ -877,6 +888,7 @@ public boolean hasBigqueryDateShardedSpec() {
    *
    * @return The bigqueryDateShardedSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpec getBigqueryDateShardedSpec() {
     if (typeSpecCase_ == 15) {
       return (com.google.cloud.datacatalog.v1.BigQueryDateShardedSpec) typeSpec_;
@@ -895,6 +907,7 @@ public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpec getBigqueryDateSh
    * <code>.google.cloud.datacatalog.v1.BigQueryDateShardedSpec bigquery_date_sharded_spec = 15;
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpecOrBuilder
       getBigqueryDateShardedSpecOrBuilder() {
     if (typeSpecCase_ == 15) {
@@ -918,6 +931,7 @@ public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpec getBigqueryDateSh
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -942,6 +956,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -968,6 +983,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -991,6 +1007,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -1016,6 +1033,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return Whether the schema field is set.
    */
+  @java.lang.Override
   public boolean hasSchema() {
     return schema_ != null;
   }
@@ -1030,6 +1048,7 @@ public boolean hasSchema() {
    *
    * @return The schema.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Schema getSchema() {
     return schema_ == null ? com.google.cloud.datacatalog.v1.Schema.getDefaultInstance() : schema_;
   }
@@ -1042,6 +1061,7 @@ public com.google.cloud.datacatalog.v1.Schema getSchema() {
    *
    * <code>.google.cloud.datacatalog.v1.Schema schema = 5;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SchemaOrBuilder getSchemaOrBuilder() {
     return getSchema();
   }
@@ -1062,6 +1082,7 @@ public com.google.cloud.datacatalog.v1.SchemaOrBuilder getSchemaOrBuilder() {
    *
    * @return Whether the sourceSystemTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasSourceSystemTimestamps() {
     return sourceSystemTimestamps_ != null;
   }
@@ -1079,6 +1100,7 @@ public boolean hasSourceSystemTimestamps() {
    *
    * @return The sourceSystemTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestamps getSourceSystemTimestamps() {
     return sourceSystemTimestamps_ == null
         ? com.google.cloud.datacatalog.v1.SystemTimestamps.getDefaultInstance()
@@ -1096,6 +1118,7 @@ public com.google.cloud.datacatalog.v1.SystemTimestamps getSourceSystemTimestamp
    *
    * <code>.google.cloud.datacatalog.v1.SystemTimestamps source_system_timestamps = 7;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestampsOrBuilder
       getSourceSystemTimestampsOrBuilder() {
     return getSourceSystemTimestamps();
@@ -2075,6 +2098,7 @@ public Builder setLinkedResourceBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for type.
      */
+    @java.lang.Override
     public int getTypeValue() {
       if (entryTypeCase_ == 2) {
         return ((java.lang.Integer) entryType_).intValue();
@@ -2112,6 +2136,7 @@ public Builder setTypeValue(int value) {
      *
      * @return The type.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.EntryType getType() {
       if (entryTypeCase_ == 2) {
         @SuppressWarnings("deprecation")
@@ -2183,6 +2208,7 @@ public Builder clearType() {
      *
      * @return The userSpecifiedType.
      */
+    @java.lang.Override
     public java.lang.String getUserSpecifiedType() {
       java.lang.Object ref = "";
       if (entryTypeCase_ == 16) {
@@ -2218,6 +2244,7 @@ public java.lang.String getUserSpecifiedType() {
      *
      * @return The bytes for userSpecifiedType.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getUserSpecifiedTypeBytes() {
       java.lang.Object ref = "";
       if (entryTypeCase_ == 16) {
@@ -2335,6 +2362,7 @@ public Builder setUserSpecifiedTypeBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for integratedSystem.
      */
+    @java.lang.Override
     public int getIntegratedSystemValue() {
       if (systemCase_ == 17) {
         return ((java.lang.Integer) system_).intValue();
@@ -2376,6 +2404,7 @@ public Builder setIntegratedSystemValue(int value) {
      *
      * @return The integratedSystem.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.IntegratedSystem getIntegratedSystem() {
       if (systemCase_ == 17) {
         @SuppressWarnings("deprecation")
@@ -2449,6 +2478,7 @@ public Builder clearIntegratedSystem() {
      *
      * @return The userSpecifiedSystem.
      */
+    @java.lang.Override
     public java.lang.String getUserSpecifiedSystem() {
       java.lang.Object ref = "";
       if (systemCase_ == 18) {
@@ -2480,6 +2510,7 @@ public java.lang.String getUserSpecifiedSystem() {
      *
      * @return The bytes for userSpecifiedSystem.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getUserSpecifiedSystemBytes() {
       java.lang.Object ref = "";
       if (systemCase_ == 18) {
@@ -2588,6 +2619,7 @@ public Builder setUserSpecifiedSystemBytes(com.google.protobuf.ByteString value)
      *
      * @return Whether the gcsFilesetSpec field is set.
      */
+    @java.lang.Override
     public boolean hasGcsFilesetSpec() {
       return typeSpecCase_ == 6;
     }
@@ -2603,6 +2635,7 @@ public boolean hasGcsFilesetSpec() {
      *
      * @return The gcsFilesetSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.GcsFilesetSpec getGcsFilesetSpec() {
       if (gcsFilesetSpecBuilder_ == null) {
         if (typeSpecCase_ == 6) {
@@ -2741,6 +2774,7 @@ public com.google.cloud.datacatalog.v1.GcsFilesetSpec.Builder getGcsFilesetSpecB
      *
      * <code>.google.cloud.datacatalog.v1.GcsFilesetSpec gcs_fileset_spec = 6;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.GcsFilesetSpecOrBuilder getGcsFilesetSpecOrBuilder() {
       if ((typeSpecCase_ == 6) && (gcsFilesetSpecBuilder_ != null)) {
         return gcsFilesetSpecBuilder_.getMessageOrBuilder();
@@ -2803,6 +2837,7 @@ public com.google.cloud.datacatalog.v1.GcsFilesetSpecOrBuilder getGcsFilesetSpec
      *
      * @return Whether the bigqueryTableSpec field is set.
      */
+    @java.lang.Override
     public boolean hasBigqueryTableSpec() {
       return typeSpecCase_ == 12;
     }
@@ -2818,6 +2853,7 @@ public boolean hasBigqueryTableSpec() {
      *
      * @return The bigqueryTableSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.BigQueryTableSpec getBigqueryTableSpec() {
       if (bigqueryTableSpecBuilder_ == null) {
         if (typeSpecCase_ == 12) {
@@ -2957,6 +2993,7 @@ public com.google.cloud.datacatalog.v1.BigQueryTableSpec.Builder getBigqueryTabl
      *
      * <code>.google.cloud.datacatalog.v1.BigQueryTableSpec bigquery_table_spec = 12;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.BigQueryTableSpecOrBuilder
         getBigqueryTableSpecOrBuilder() {
       if ((typeSpecCase_ == 12) && (bigqueryTableSpecBuilder_ != null)) {
@@ -3022,6 +3059,7 @@ public com.google.cloud.datacatalog.v1.BigQueryTableSpec.Builder getBigqueryTabl
      *
      * @return Whether the bigqueryDateShardedSpec field is set.
      */
+    @java.lang.Override
     public boolean hasBigqueryDateShardedSpec() {
       return typeSpecCase_ == 15;
     }
@@ -3039,6 +3077,7 @@ public boolean hasBigqueryDateShardedSpec() {
      *
      * @return The bigqueryDateShardedSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpec getBigqueryDateShardedSpec() {
       if (bigqueryDateShardedSpecBuilder_ == null) {
         if (typeSpecCase_ == 15) {
@@ -3193,6 +3232,7 @@ public Builder clearBigqueryDateShardedSpec() {
      * <code>.google.cloud.datacatalog.v1.BigQueryDateShardedSpec bigquery_date_sharded_spec = 15;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.BigQueryDateShardedSpecOrBuilder
         getBigqueryDateShardedSpecOrBuilder() {
       if ((typeSpecCase_ == 15) && (bigqueryDateShardedSpecBuilder_ != null)) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
index 6c66f9e9..a7dfc4ce 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryGroup.java
@@ -161,6 +161,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) {
@@ -186,6 +187,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) {
@@ -212,6 +214,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -235,6 +238,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -262,6 +266,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -286,6 +291,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -314,6 +320,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return Whether the dataCatalogTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasDataCatalogTimestamps() {
     return dataCatalogTimestamps_ != null;
   }
@@ -331,6 +338,7 @@ public boolean hasDataCatalogTimestamps() {
    *
    * @return The dataCatalogTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestamps getDataCatalogTimestamps() {
     return dataCatalogTimestamps_ == null
         ? com.google.cloud.datacatalog.v1.SystemTimestamps.getDefaultInstance()
@@ -348,6 +356,7 @@ public com.google.cloud.datacatalog.v1.SystemTimestamps getDataCatalogTimestamps
    * .google.cloud.datacatalog.v1.SystemTimestamps data_catalog_timestamps = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestampsOrBuilder
       getDataCatalogTimestampsOrBuilder() {
     return getDataCatalogTimestamps();
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryType.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryType.java
index 2329827a..89cd1fc3 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryType.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/EntryType.java
@@ -193,6 +193,10 @@ public EntryType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/FieldType.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/FieldType.java
index 1c116f6a..b39c282a 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/FieldType.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/FieldType.java
@@ -277,6 +277,10 @@ public PrimitiveType 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());
     }
 
@@ -623,6 +627,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        *
        * @return The displayName.
        */
+      @java.lang.Override
       public java.lang.String getDisplayName() {
         java.lang.Object ref = displayName_;
         if (ref instanceof java.lang.String) {
@@ -645,6 +650,7 @@ public java.lang.String getDisplayName() {
        *
        * @return The bytes for displayName.
        */
+      @java.lang.Override
       public com.google.protobuf.ByteString getDisplayNameBytes() {
         java.lang.Object ref = displayName_;
         if (ref instanceof java.lang.String) {
@@ -1155,6 +1161,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * <code>repeated .google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public java.util.List<com.google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue>
         getAllowedValuesList() {
       return allowedValues_;
@@ -1174,6 +1181,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * <code>repeated .google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public java.util.List<
             ? extends com.google.cloud.datacatalog.v1.FieldType.EnumType.EnumValueOrBuilder>
         getAllowedValuesOrBuilderList() {
@@ -1194,6 +1202,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * <code>repeated .google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public int getAllowedValuesCount() {
       return allowedValues_.size();
     }
@@ -1212,6 +1221,7 @@ public int getAllowedValuesCount() {
      * <code>repeated .google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue getAllowedValues(
         int index) {
       return allowedValues_.get(index);
@@ -1231,6 +1241,7 @@ public com.google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue getAllowedVa
      * <code>repeated .google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.FieldType.EnumType.EnumValueOrBuilder
         getAllowedValuesOrBuilder(int index) {
       return allowedValues_.get(index);
@@ -2242,6 +2253,7 @@ public com.google.cloud.datacatalog.v1.FieldType.PrimitiveType getPrimitiveType(
    *
    * @return Whether the enumType field is set.
    */
+  @java.lang.Override
   public boolean hasEnumType() {
     return typeDeclCase_ == 2;
   }
@@ -2256,6 +2268,7 @@ public boolean hasEnumType() {
    *
    * @return The enumType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.FieldType.EnumType getEnumType() {
     if (typeDeclCase_ == 2) {
       return (com.google.cloud.datacatalog.v1.FieldType.EnumType) typeDecl_;
@@ -2271,6 +2284,7 @@ public com.google.cloud.datacatalog.v1.FieldType.EnumType getEnumType() {
    *
    * <code>.google.cloud.datacatalog.v1.FieldType.EnumType enum_type = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.FieldType.EnumTypeOrBuilder getEnumTypeOrBuilder() {
     if (typeDeclCase_ == 2) {
       return (com.google.cloud.datacatalog.v1.FieldType.EnumType) typeDecl_;
@@ -2662,6 +2676,7 @@ public Builder clearTypeDecl() {
      *
      * @return The enum numeric value on the wire for primitiveType.
      */
+    @java.lang.Override
     public int getPrimitiveTypeValue() {
       if (typeDeclCase_ == 1) {
         return ((java.lang.Integer) typeDecl_).intValue();
@@ -2697,6 +2712,7 @@ public Builder setPrimitiveTypeValue(int value) {
      *
      * @return The primitiveType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.FieldType.PrimitiveType getPrimitiveType() {
       if (typeDeclCase_ == 1) {
         @SuppressWarnings("deprecation")
@@ -2766,6 +2782,7 @@ public Builder clearPrimitiveType() {
      *
      * @return Whether the enumType field is set.
      */
+    @java.lang.Override
     public boolean hasEnumType() {
       return typeDeclCase_ == 2;
     }
@@ -2780,6 +2797,7 @@ public boolean hasEnumType() {
      *
      * @return The enumType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.FieldType.EnumType getEnumType() {
       if (enumTypeBuilder_ == null) {
         if (typeDeclCase_ == 2) {
@@ -2913,6 +2931,7 @@ public com.google.cloud.datacatalog.v1.FieldType.EnumType.Builder getEnumTypeBui
      *
      * <code>.google.cloud.datacatalog.v1.FieldType.EnumType enum_type = 2;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.FieldType.EnumTypeOrBuilder getEnumTypeOrBuilder() {
       if ((typeDeclCase_ == 2) && (enumTypeBuilder_ != null)) {
         return enumTypeBuilder_.getMessageOrBuilder();
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFileSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFileSpec.java
index e9976874..6b0323b7 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFileSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFileSpec.java
@@ -145,6 +145,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The filePath.
    */
+  @java.lang.Override
   public java.lang.String getFilePath() {
     java.lang.Object ref = filePath_;
     if (ref instanceof java.lang.String) {
@@ -167,6 +168,7 @@ public java.lang.String getFilePath() {
    *
    * @return The bytes for filePath.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getFilePathBytes() {
     java.lang.Object ref = filePath_;
     if (ref instanceof java.lang.String) {
@@ -194,6 +196,7 @@ public com.google.protobuf.ByteString getFilePathBytes() {
    *
    * @return Whether the gcsTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasGcsTimestamps() {
     return gcsTimestamps_ != null;
   }
@@ -210,6 +213,7 @@ public boolean hasGcsTimestamps() {
    *
    * @return The gcsTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestamps getGcsTimestamps() {
     return gcsTimestamps_ == null
         ? com.google.cloud.datacatalog.v1.SystemTimestamps.getDefaultInstance()
@@ -226,6 +230,7 @@ public com.google.cloud.datacatalog.v1.SystemTimestamps getGcsTimestamps() {
    * .google.cloud.datacatalog.v1.SystemTimestamps gcs_timestamps = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SystemTimestampsOrBuilder getGcsTimestampsOrBuilder() {
     return getGcsTimestamps();
   }
@@ -243,6 +248,7 @@ public com.google.cloud.datacatalog.v1.SystemTimestampsOrBuilder getGcsTimestamp
    *
    * @return The sizeBytes.
    */
+  @java.lang.Override
   public long getSizeBytes() {
     return sizeBytes_;
   }
@@ -928,6 +934,7 @@ public com.google.cloud.datacatalog.v1.SystemTimestampsOrBuilder getGcsTimestamp
      *
      * @return The sizeBytes.
      */
+    @java.lang.Override
     public long getSizeBytes() {
       return sizeBytes_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFilesetSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFilesetSpec.java
index 811a87a9..e80ba46c 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFilesetSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GcsFilesetSpec.java
@@ -293,6 +293,7 @@ public com.google.protobuf.ByteString getFilePatternsBytes(int index) {
    * repeated .google.cloud.datacatalog.v1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.GcsFileSpec> getSampleGcsFileSpecsList() {
     return sampleGcsFileSpecs_;
   }
@@ -308,6 +309,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.GcsFileSpec> getSampleGcsF
    * repeated .google.cloud.datacatalog.v1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.GcsFileSpecOrBuilder>
       getSampleGcsFileSpecsOrBuilderList() {
     return sampleGcsFileSpecs_;
@@ -324,6 +326,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.GcsFileSpec> getSampleGcsF
    * repeated .google.cloud.datacatalog.v1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public int getSampleGcsFileSpecsCount() {
     return sampleGcsFileSpecs_.size();
   }
@@ -339,6 +342,7 @@ public int getSampleGcsFileSpecsCount() {
    * repeated .google.cloud.datacatalog.v1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.GcsFileSpec getSampleGcsFileSpecs(int index) {
     return sampleGcsFileSpecs_.get(index);
   }
@@ -354,6 +358,7 @@ public com.google.cloud.datacatalog.v1.GcsFileSpec getSampleGcsFileSpecs(int ind
    * repeated .google.cloud.datacatalog.v1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.GcsFileSpecOrBuilder getSampleGcsFileSpecsOrBuilder(
       int index) {
     return sampleGcsFileSpecs_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryGroupRequest.java
index 8f73a8bb..62e5911e 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryGroupRequest.java
@@ -143,6 +143,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) {
@@ -168,6 +169,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) {
@@ -193,6 +195,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return Whether the readMask field is set.
    */
+  @java.lang.Override
   public boolean hasReadMask() {
     return readMask_ != null;
   }
@@ -207,6 +210,7 @@ public boolean hasReadMask() {
    *
    * @return The readMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getReadMask() {
     return readMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : readMask_;
   }
@@ -219,6 +223,7 @@ public com.google.protobuf.FieldMask getReadMask() {
    *
    * <code>.google.protobuf.FieldMask read_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getReadMaskOrBuilder() {
     return getReadMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryRequest.java
index 29302a43..1c51b6d9 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetEntryRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetTagTemplateRequest.java
index b3c23234..b90b139b 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/GetTagTemplateRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/IntegratedSystem.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/IntegratedSystem.java
index 74da0043..b034e7a5 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/IntegratedSystem.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/IntegratedSystem.java
@@ -140,6 +140,10 @@ public IntegratedSystem 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesRequest.java
index 07367b3c..8736aa38 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesRequest.java
@@ -157,6 +157,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -183,6 +184,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -209,6 +211,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -227,6 +230,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -250,6 +254,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -278,6 +283,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return Whether the readMask field is set.
    */
+  @java.lang.Override
   public boolean hasReadMask() {
     return readMask_ != null;
   }
@@ -295,6 +301,7 @@ public boolean hasReadMask() {
    *
    * @return The readMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getReadMask() {
     return readMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : readMask_;
   }
@@ -310,6 +317,7 @@ public com.google.protobuf.FieldMask getReadMask() {
    *
    * <code>.google.protobuf.FieldMask read_mask = 4;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getReadMaskOrBuilder() {
     return getReadMask();
   }
@@ -831,6 +839,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesResponse.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesResponse.java
index 623be8ae..c7c3e706 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesResponse.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntriesResponse.java
@@ -139,6 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.Entry> getEntriesList() {
     return entries_;
   }
@@ -151,6 +152,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.Entry> getEntriesList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.EntryOrBuilder>
       getEntriesOrBuilderList() {
     return entries_;
@@ -164,6 +166,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.Entry> getEntriesList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public int getEntriesCount() {
     return entries_.size();
   }
@@ -176,6 +179,7 @@ public int getEntriesCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Entry getEntries(int index) {
     return entries_.get(index);
   }
@@ -188,6 +192,7 @@ public com.google.cloud.datacatalog.v1.Entry getEntries(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryOrBuilder getEntriesOrBuilder(int index) {
     return entries_.get(index);
   }
@@ -206,6 +211,7 @@ public com.google.cloud.datacatalog.v1.EntryOrBuilder getEntriesOrBuilder(int in
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -229,6 +235,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
index ea7ed013..8ce53cb7 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsRequest.java
@@ -142,6 +142,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -168,6 +169,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -194,6 +196,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -212,6 +215,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -235,6 +239,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -737,6 +742,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsResponse.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsResponse.java
index 0c722827..b1db5ee9 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsResponse.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListEntryGroupsResponse.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.EntryGroup> getEntryGroupsList() {
     return entryGroups_;
   }
@@ -152,6 +153,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.EntryGroup> getEntryGroups
    *
    * <code>repeated .google.cloud.datacatalog.v1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.EntryGroupOrBuilder>
       getEntryGroupsOrBuilderList() {
     return entryGroups_;
@@ -165,6 +167,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.EntryGroup> getEntryGroups
    *
    * <code>repeated .google.cloud.datacatalog.v1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public int getEntryGroupsCount() {
     return entryGroups_.size();
   }
@@ -177,6 +180,7 @@ public int getEntryGroupsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroups(int index) {
     return entryGroups_.get(index);
   }
@@ -189,6 +193,7 @@ public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroups(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroupOrBuilder getEntryGroupsOrBuilder(int index) {
     return entryGroups_.get(index);
   }
@@ -207,6 +212,7 @@ public com.google.cloud.datacatalog.v1.EntryGroupOrBuilder getEntryGroupsOrBuild
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -230,6 +236,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
index 2aa0c525..167f50b4 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsRequest.java
@@ -145,6 +145,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -174,6 +175,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -199,6 +201,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -217,6 +220,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -240,6 +244,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -754,6 +759,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsResponse.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsResponse.java
index b6ee14cc..74bc68d8 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsResponse.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ListTagsResponse.java
@@ -139,6 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.Tag> getTagsList() {
     return tags_;
   }
@@ -151,6 +152,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.Tag> getTagsList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.TagOrBuilder>
       getTagsOrBuilderList() {
     return tags_;
@@ -164,6 +166,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.Tag> getTagsList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public int getTagsCount() {
     return tags_.size();
   }
@@ -176,6 +179,7 @@ public int getTagsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Tag getTags(int index) {
     return tags_.get(index);
   }
@@ -188,6 +192,7 @@ public com.google.cloud.datacatalog.v1.Tag getTags(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagOrBuilder getTagsOrBuilder(int index) {
     return tags_.get(index);
   }
@@ -206,6 +211,7 @@ public com.google.cloud.datacatalog.v1.TagOrBuilder getTagsOrBuilder(int index)
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -229,6 +235,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/LookupEntryRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/LookupEntryRequest.java
index e17b254a..c7183535 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/LookupEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/LookupEntryRequest.java
@@ -702,6 +702,7 @@ public Builder clearTargetName() {
      *
      * @return The linkedResource.
      */
+    @java.lang.Override
     public java.lang.String getLinkedResource() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 1) {
@@ -735,6 +736,7 @@ public java.lang.String getLinkedResource() {
      *
      * @return The bytes for linkedResource.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getLinkedResourceBytes() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 1) {
@@ -851,6 +853,7 @@ public Builder setLinkedResourceBytes(com.google.protobuf.ByteString value) {
      *
      * @return The sqlResource.
      */
+    @java.lang.Override
     public java.lang.String getSqlResource() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 3) {
@@ -886,6 +889,7 @@ public java.lang.String getSqlResource() {
      *
      * @return The bytes for sqlResource.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getSqlResourceBytes() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 3) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
index 01bf0c77..70a9224a 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/RenameTagTemplateFieldRequest.java
@@ -136,6 +136,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) {
@@ -161,6 +162,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) {
@@ -187,6 +189,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The newTagTemplateFieldId.
    */
+  @java.lang.Override
   public java.lang.String getNewTagTemplateFieldId() {
     java.lang.Object ref = newTagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -210,6 +213,7 @@ public java.lang.String getNewTagTemplateFieldId() {
    *
    * @return The bytes for newTagTemplateFieldId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getNewTagTemplateFieldIdBytes() {
     java.lang.Object ref = newTagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Schema.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Schema.java
index ad8a319c..6152f63a 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Schema.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Schema.java
@@ -133,6 +133,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getColumnsList() {
     return columns_;
   }
@@ -148,6 +149,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getColumnsLi
    * repeated .google.cloud.datacatalog.v1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.ColumnSchemaOrBuilder>
       getColumnsOrBuilderList() {
     return columns_;
@@ -164,6 +166,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.ColumnSchema> getColumnsLi
    * repeated .google.cloud.datacatalog.v1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public int getColumnsCount() {
     return columns_.size();
   }
@@ -179,6 +182,7 @@ public int getColumnsCount() {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ColumnSchema getColumns(int index) {
     return columns_.get(index);
   }
@@ -194,6 +198,7 @@ public com.google.cloud.datacatalog.v1.ColumnSchema getColumns(int index) {
    * repeated .google.cloud.datacatalog.v1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.ColumnSchemaOrBuilder getColumnsOrBuilder(int index) {
     return columns_.get(index);
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
index f27db642..6717b972 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogRequest.java
@@ -763,6 +763,7 @@ public com.google.protobuf.ByteString getIncludeProjectIdsBytes(int index) {
      *
      * @return The includeGcpPublicDatasets.
      */
+    @java.lang.Override
     public boolean getIncludeGcpPublicDatasets() {
       return includeGcpPublicDatasets_;
     }
@@ -1778,6 +1779,7 @@ public Builder addIncludeProjectIdsBytes(com.google.protobuf.ByteString value) {
        *
        * @return The includeGcpPublicDatasets.
        */
+      @java.lang.Override
       public boolean getIncludeGcpPublicDatasets() {
         return includeGcpPublicDatasets_;
       }
@@ -2368,6 +2370,7 @@ public com.google.cloud.datacatalog.v1.SearchCatalogRequest.Scope getDefaultInst
    *
    * @return Whether the scope field is set.
    */
+  @java.lang.Override
   public boolean hasScope() {
     return scope_ != null;
   }
@@ -2387,6 +2390,7 @@ public boolean hasScope() {
    *
    * @return The scope.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SearchCatalogRequest.Scope getScope() {
     return scope_ == null
         ? com.google.cloud.datacatalog.v1.SearchCatalogRequest.Scope.getDefaultInstance()
@@ -2406,6 +2410,7 @@ public com.google.cloud.datacatalog.v1.SearchCatalogRequest.Scope getScope() {
    * .google.cloud.datacatalog.v1.SearchCatalogRequest.Scope scope = 6 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SearchCatalogRequest.ScopeOrBuilder getScopeOrBuilder() {
     return getScope();
   }
@@ -2432,6 +2437,7 @@ public com.google.cloud.datacatalog.v1.SearchCatalogRequest.ScopeOrBuilder getSc
    *
    * @return The query.
    */
+  @java.lang.Override
   public java.lang.String getQuery() {
     java.lang.Object ref = query_;
     if (ref instanceof java.lang.String) {
@@ -2463,6 +2469,7 @@ public java.lang.String getQuery() {
    *
    * @return The bytes for query.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getQueryBytes() {
     java.lang.Object ref = query_;
     if (ref instanceof java.lang.String) {
@@ -2489,6 +2496,7 @@ public com.google.protobuf.ByteString getQueryBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -2511,6 +2519,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -2538,6 +2547,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -2568,6 +2578,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return The orderBy.
    */
+  @java.lang.Override
   public java.lang.String getOrderBy() {
     java.lang.Object ref = orderBy_;
     if (ref instanceof java.lang.String) {
@@ -2595,6 +2606,7 @@ public java.lang.String getOrderBy() {
    *
    * @return The bytes for orderBy.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getOrderByBytes() {
     java.lang.Object ref = orderBy_;
     if (ref instanceof java.lang.String) {
@@ -3396,6 +3408,7 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResponse.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResponse.java
index fc2b1305..08270377 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResponse.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResponse.java
@@ -155,6 +155,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1.SearchCatalogResult> getResultsList() {
     return results_;
   }
@@ -167,6 +168,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.SearchCatalogResult> getRe
    *
    * <code>repeated .google.cloud.datacatalog.v1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1.SearchCatalogResultOrBuilder>
       getResultsOrBuilderList() {
     return results_;
@@ -180,6 +182,7 @@ public java.util.List<com.google.cloud.datacatalog.v1.SearchCatalogResult> getRe
    *
    * <code>repeated .google.cloud.datacatalog.v1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public int getResultsCount() {
     return results_.size();
   }
@@ -192,6 +195,7 @@ public int getResultsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SearchCatalogResult getResults(int index) {
     return results_.get(index);
   }
@@ -204,6 +208,7 @@ public com.google.cloud.datacatalog.v1.SearchCatalogResult getResults(int index)
    *
    * <code>repeated .google.cloud.datacatalog.v1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SearchCatalogResultOrBuilder getResultsOrBuilder(
       int index) {
     return results_.get(index);
@@ -222,6 +227,7 @@ public com.google.cloud.datacatalog.v1.SearchCatalogResultOrBuilder getResultsOr
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -244,6 +250,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResult.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResult.java
index 7b3a4724..89784f3e 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResult.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchCatalogResult.java
@@ -211,6 +211,7 @@ public SystemCase getSystemCase() {
    *
    * @return The enum numeric value on the wire for searchResultType.
    */
+  @java.lang.Override
   public int getSearchResultTypeValue() {
     return searchResultType_;
   }
@@ -226,6 +227,7 @@ public int getSearchResultTypeValue() {
    *
    * @return The searchResultType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.SearchResultType getSearchResultType() {
     @SuppressWarnings("deprecation")
     com.google.cloud.datacatalog.v1.SearchResultType result =
@@ -249,6 +251,7 @@ public com.google.cloud.datacatalog.v1.SearchResultType getSearchResultType() {
    *
    * @return The searchResultSubtype.
    */
+  @java.lang.Override
   public java.lang.String getSearchResultSubtype() {
     java.lang.Object ref = searchResultSubtype_;
     if (ref instanceof java.lang.String) {
@@ -274,6 +277,7 @@ public java.lang.String getSearchResultSubtype() {
    *
    * @return The bytes for searchResultSubtype.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getSearchResultSubtypeBytes() {
     java.lang.Object ref = searchResultSubtype_;
     if (ref instanceof java.lang.String) {
@@ -302,6 +306,7 @@ public com.google.protobuf.ByteString getSearchResultSubtypeBytes() {
    *
    * @return The relativeResourceName.
    */
+  @java.lang.Override
   public java.lang.String getRelativeResourceName() {
     java.lang.Object ref = relativeResourceName_;
     if (ref instanceof java.lang.String) {
@@ -327,6 +332,7 @@ public java.lang.String getRelativeResourceName() {
    *
    * @return The bytes for relativeResourceName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getRelativeResourceNameBytes() {
     java.lang.Object ref = relativeResourceName_;
     if (ref instanceof java.lang.String) {
@@ -355,6 +361,7 @@ public com.google.protobuf.ByteString getRelativeResourceNameBytes() {
    *
    * @return The linkedResource.
    */
+  @java.lang.Override
   public java.lang.String getLinkedResource() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -380,6 +387,7 @@ public java.lang.String getLinkedResource() {
    *
    * @return The bytes for linkedResource.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getLinkedResourceBytes() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -957,6 +965,7 @@ public Builder clearSystem() {
      *
      * @return The enum numeric value on the wire for searchResultType.
      */
+    @java.lang.Override
     public int getSearchResultTypeValue() {
       return searchResultType_;
     }
@@ -974,6 +983,7 @@ public int getSearchResultTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSearchResultTypeValue(int value) {
+
       searchResultType_ = value;
       onChanged();
       return this;
@@ -990,6 +1000,7 @@ public Builder setSearchResultTypeValue(int value) {
      *
      * @return The searchResultType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.SearchResultType getSearchResultType() {
       @SuppressWarnings("deprecation")
       com.google.cloud.datacatalog.v1.SearchResultType result =
@@ -1416,6 +1427,7 @@ public Builder setLinkedResourceBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for integratedSystem.
      */
+    @java.lang.Override
     public int getIntegratedSystemValue() {
       if (systemCase_ == 8) {
         return ((java.lang.Integer) system_).intValue();
@@ -1457,6 +1469,7 @@ public Builder setIntegratedSystemValue(int value) {
      *
      * @return The integratedSystem.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.IntegratedSystem getIntegratedSystem() {
       if (systemCase_ == 8) {
         @SuppressWarnings("deprecation")
@@ -1527,6 +1540,7 @@ public Builder clearIntegratedSystem() {
      *
      * @return The userSpecifiedSystem.
      */
+    @java.lang.Override
     public java.lang.String getUserSpecifiedSystem() {
       java.lang.Object ref = "";
       if (systemCase_ == 9) {
@@ -1555,6 +1569,7 @@ public java.lang.String getUserSpecifiedSystem() {
      *
      * @return The bytes for userSpecifiedSystem.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getUserSpecifiedSystemBytes() {
       java.lang.Object ref = "";
       if (systemCase_ == 9) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchResultType.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchResultType.java
index 8a4662a4..a6e97d48 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchResultType.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SearchResultType.java
@@ -161,6 +161,10 @@ public SearchResultType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SystemTimestamps.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SystemTimestamps.java
index 4b170f55..85b3a47f 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SystemTimestamps.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/SystemTimestamps.java
@@ -160,6 +160,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the createTime field is set.
    */
+  @java.lang.Override
   public boolean hasCreateTime() {
     return createTime_ != null;
   }
@@ -174,6 +175,7 @@ public boolean hasCreateTime() {
    *
    * @return The createTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
@@ -186,6 +188,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    *
    * <code>.google.protobuf.Timestamp create_time = 1;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     return getCreateTime();
   }
@@ -203,6 +206,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    *
    * @return Whether the updateTime field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateTime() {
     return updateTime_ != null;
   }
@@ -217,6 +221,7 @@ public boolean hasUpdateTime() {
    *
    * @return The updateTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getUpdateTime() {
     return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
@@ -229,6 +234,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    *
    * <code>.google.protobuf.Timestamp update_time = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     return getUpdateTime();
   }
@@ -248,6 +254,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    *
    * @return Whether the expireTime field is set.
    */
+  @java.lang.Override
   public boolean hasExpireTime() {
     return expireTime_ != null;
   }
@@ -264,6 +271,7 @@ public boolean hasExpireTime() {
    *
    * @return The expireTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getExpireTime() {
     return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_;
   }
@@ -278,6 +286,7 @@ public com.google.protobuf.Timestamp getExpireTime() {
    * <code>.google.protobuf.Timestamp expire_time = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
     return getExpireTime();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSourceType.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSourceType.java
index 444457f9..00562ea0 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSourceType.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSourceType.java
@@ -139,6 +139,10 @@ public TableSourceType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSpec.java
index 6c8dd469..32f49623 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TableSpec.java
@@ -130,6 +130,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The groupedEntry.
    */
+  @java.lang.Override
   public java.lang.String getGroupedEntry() {
     java.lang.Object ref = groupedEntry_;
     if (ref instanceof java.lang.String) {
@@ -158,6 +159,7 @@ public java.lang.String getGroupedEntry() {
    *
    * @return The bytes for groupedEntry.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getGroupedEntryBytes() {
     java.lang.Object ref = groupedEntry_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Tag.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Tag.java
index 477cf713..7fb10344 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Tag.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/Tag.java
@@ -226,6 +226,7 @@ public ScopeCase getScopeCase() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -251,6 +252,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) {
@@ -278,6 +280,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The template.
    */
+  @java.lang.Override
   public java.lang.String getTemplate() {
     java.lang.Object ref = template_;
     if (ref instanceof java.lang.String) {
@@ -302,6 +305,7 @@ public java.lang.String getTemplate() {
    *
    * @return The bytes for template.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTemplateBytes() {
     java.lang.Object ref = template_;
     if (ref instanceof java.lang.String) {
@@ -327,6 +331,7 @@ public com.google.protobuf.ByteString getTemplateBytes() {
    *
    * @return The templateDisplayName.
    */
+  @java.lang.Override
   public java.lang.String getTemplateDisplayName() {
     java.lang.Object ref = templateDisplayName_;
     if (ref instanceof java.lang.String) {
@@ -349,6 +354,7 @@ public java.lang.String getTemplateDisplayName() {
    *
    * @return The bytes for templateDisplayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTemplateDisplayNameBytes() {
     java.lang.Object ref = templateDisplayName_;
     if (ref instanceof java.lang.String) {
@@ -468,6 +474,7 @@ public int getFieldsCount() {
    * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public boolean containsFields(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -475,6 +482,7 @@ public boolean containsFields(java.lang.String key) {
     return internalGetFields().getMap().containsKey(key);
   }
   /** Use {@link #getFieldsMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField> getFields() {
     return getFieldsMap();
@@ -492,6 +500,7 @@ public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField>
    * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField> getFieldsMap() {
     return internalGetFields().getMap();
   }
@@ -508,6 +517,7 @@ public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField>
    * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagField getFieldsOrDefault(
       java.lang.String key, com.google.cloud.datacatalog.v1.TagField defaultValue) {
     if (key == null) {
@@ -530,6 +540,7 @@ public com.google.cloud.datacatalog.v1.TagField getFieldsOrDefault(
    * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagField getFieldsOrThrow(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -1349,6 +1360,7 @@ public Builder setTemplateDisplayNameBytes(com.google.protobuf.ByteString value)
      *
      * @return The column.
      */
+    @java.lang.Override
     public java.lang.String getColumn() {
       java.lang.Object ref = "";
       if (scopeCase_ == 4) {
@@ -1380,6 +1392,7 @@ public java.lang.String getColumn() {
      *
      * @return The bytes for column.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getColumnBytes() {
       java.lang.Object ref = "";
       if (scopeCase_ == 4) {
@@ -1511,6 +1524,7 @@ public int getFieldsCount() {
      * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public boolean containsFields(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -1518,6 +1532,7 @@ public boolean containsFields(java.lang.String key) {
       return internalGetFields().getMap().containsKey(key);
     }
     /** Use {@link #getFieldsMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField> getFields() {
       return getFieldsMap();
@@ -1535,6 +1550,7 @@ public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField>
      * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField>
         getFieldsMap() {
       return internalGetFields().getMap();
@@ -1552,6 +1568,7 @@ public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagField>
      * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagField getFieldsOrDefault(
         java.lang.String key, com.google.cloud.datacatalog.v1.TagField defaultValue) {
       if (key == null) {
@@ -1574,6 +1591,7 @@ public com.google.cloud.datacatalog.v1.TagField getFieldsOrDefault(
      * map&lt;string, .google.cloud.datacatalog.v1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagField getFieldsOrThrow(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagField.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagField.java
index 7f2ff85d..e76764f6 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagField.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagField.java
@@ -304,6 +304,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The displayName.
      */
+    @java.lang.Override
     public java.lang.String getDisplayName() {
       java.lang.Object ref = displayName_;
       if (ref instanceof java.lang.String) {
@@ -326,6 +327,7 @@ public java.lang.String getDisplayName() {
      *
      * @return The bytes for displayName.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getDisplayNameBytes() {
       java.lang.Object ref = displayName_;
       if (ref instanceof java.lang.String) {
@@ -887,6 +889,7 @@ public KindCase getKindCase() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -909,6 +912,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -933,6 +937,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The doubleValue.
    */
+  @java.lang.Override
   public double getDoubleValue() {
     if (kindCase_ == 2) {
       return (java.lang.Double) kind_;
@@ -1008,6 +1013,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
    *
    * @return The boolValue.
    */
+  @java.lang.Override
   public boolean getBoolValue() {
     if (kindCase_ == 4) {
       return (java.lang.Boolean) kind_;
@@ -1027,6 +1033,7 @@ public boolean getBoolValue() {
    *
    * @return Whether the timestampValue field is set.
    */
+  @java.lang.Override
   public boolean hasTimestampValue() {
     return kindCase_ == 5;
   }
@@ -1041,6 +1048,7 @@ public boolean hasTimestampValue() {
    *
    * @return The timestampValue.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (kindCase_ == 5) {
       return (com.google.protobuf.Timestamp) kind_;
@@ -1056,6 +1064,7 @@ public com.google.protobuf.Timestamp getTimestampValue() {
    *
    * <code>.google.protobuf.Timestamp timestamp_value = 5;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     if (kindCase_ == 5) {
       return (com.google.protobuf.Timestamp) kind_;
@@ -1076,6 +1085,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
    *
    * @return Whether the enumValue field is set.
    */
+  @java.lang.Override
   public boolean hasEnumValue() {
     return kindCase_ == 6;
   }
@@ -1091,6 +1101,7 @@ public boolean hasEnumValue() {
    *
    * @return The enumValue.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagField.EnumValue getEnumValue() {
     if (kindCase_ == 6) {
       return (com.google.cloud.datacatalog.v1.TagField.EnumValue) kind_;
@@ -1107,6 +1118,7 @@ public com.google.cloud.datacatalog.v1.TagField.EnumValue getEnumValue() {
    *
    * <code>.google.cloud.datacatalog.v1.TagField.EnumValue enum_value = 6;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagField.EnumValueOrBuilder getEnumValueOrBuilder() {
     if (kindCase_ == 6) {
       return (com.google.cloud.datacatalog.v1.TagField.EnumValue) kind_;
@@ -1131,6 +1143,7 @@ public com.google.cloud.datacatalog.v1.TagField.EnumValueOrBuilder getEnumValueO
    *
    * @return The order.
    */
+  @java.lang.Override
   public int getOrder() {
     return order_;
   }
@@ -1797,6 +1810,7 @@ public Builder clearDoubleValue() {
      *
      * @return The stringValue.
      */
+    @java.lang.Override
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
       if (kindCase_ == 3) {
@@ -1824,6 +1838,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 (kindCase_ == 3) {
@@ -1974,6 +1989,7 @@ public Builder clearBoolValue() {
      *
      * @return Whether the timestampValue field is set.
      */
+    @java.lang.Override
     public boolean hasTimestampValue() {
       return kindCase_ == 5;
     }
@@ -1988,6 +2004,7 @@ public boolean hasTimestampValue() {
      *
      * @return The timestampValue.
      */
+    @java.lang.Override
     public com.google.protobuf.Timestamp getTimestampValue() {
       if (timestampValueBuilder_ == null) {
         if (kindCase_ == 5) {
@@ -2117,6 +2134,7 @@ public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
      *
      * <code>.google.protobuf.Timestamp timestamp_value = 5;</code>
      */
+    @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       if ((kindCase_ == 5) && (timestampValueBuilder_ != null)) {
         return timestampValueBuilder_.getMessageOrBuilder();
@@ -2176,6 +2194,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      *
      * @return Whether the enumValue field is set.
      */
+    @java.lang.Override
     public boolean hasEnumValue() {
       return kindCase_ == 6;
     }
@@ -2191,6 +2210,7 @@ public boolean hasEnumValue() {
      *
      * @return The enumValue.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagField.EnumValue getEnumValue() {
       if (enumValueBuilder_ == null) {
         if (kindCase_ == 6) {
@@ -2329,6 +2349,7 @@ public com.google.cloud.datacatalog.v1.TagField.EnumValue.Builder getEnumValueBu
      *
      * <code>.google.cloud.datacatalog.v1.TagField.EnumValue enum_value = 6;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagField.EnumValueOrBuilder getEnumValueOrBuilder() {
       if ((kindCase_ == 6) && (enumValueBuilder_ != null)) {
         return enumValueBuilder_.getMessageOrBuilder();
@@ -2390,6 +2411,7 @@ public com.google.cloud.datacatalog.v1.TagField.EnumValueOrBuilder getEnumValueO
      *
      * @return The order.
      */
+    @java.lang.Override
     public int getOrder() {
       return order_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplate.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplate.java
index f9c7d41b..ca5d51c1 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplate.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplate.java
@@ -170,6 +170,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -195,6 +196,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) {
@@ -220,6 +222,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -242,6 +245,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -304,6 +308,7 @@ public int getFieldsCount() {
    * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public boolean containsFields(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -311,6 +316,7 @@ public boolean containsFields(java.lang.String key) {
     return internalGetFields().getMap().containsKey(key);
   }
   /** Use {@link #getFieldsMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagTemplateField>
       getFields() {
@@ -333,6 +339,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagTemplateField>
       getFieldsMap() {
     return internalGetFields().getMap();
@@ -354,6 +361,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrDefault(
       java.lang.String key, com.google.cloud.datacatalog.v1.TagTemplateField defaultValue) {
     if (key == null) {
@@ -380,6 +388,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrDefault(
    * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrThrow(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -1051,6 +1060,7 @@ public int getFieldsCount() {
      * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public boolean containsFields(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -1058,6 +1068,7 @@ public boolean containsFields(java.lang.String key) {
       return internalGetFields().getMap().containsKey(key);
     }
     /** Use {@link #getFieldsMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagTemplateField>
         getFields() {
@@ -1080,6 +1091,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1.TagTemplateField>
         getFieldsMap() {
       return internalGetFields().getMap();
@@ -1101,6 +1113,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrDefault(
         java.lang.String key, com.google.cloud.datacatalog.v1.TagTemplateField defaultValue) {
       if (key == null) {
@@ -1127,6 +1140,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrDefault(
      * map&lt;string, .google.cloud.datacatalog.v1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1.TagTemplateField getFieldsOrThrow(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplateField.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplateField.java
index 19716a14..29a64d6d 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplateField.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/TagTemplateField.java
@@ -161,6 +161,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) {
@@ -186,6 +187,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) {
@@ -211,6 +213,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -233,6 +236,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -260,6 +264,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return Whether the type field is set.
    */
+  @java.lang.Override
   public boolean hasType() {
     return type_ != null;
   }
@@ -276,6 +281,7 @@ public boolean hasType() {
    *
    * @return The type.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.FieldType getType() {
     return type_ == null ? com.google.cloud.datacatalog.v1.FieldType.getDefaultInstance() : type_;
   }
@@ -290,6 +296,7 @@ public com.google.cloud.datacatalog.v1.FieldType getType() {
    * .google.cloud.datacatalog.v1.FieldType type = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.FieldTypeOrBuilder getTypeOrBuilder() {
     return getType();
   }
@@ -307,6 +314,7 @@ public com.google.cloud.datacatalog.v1.FieldTypeOrBuilder getTypeOrBuilder() {
    *
    * @return The isRequired.
    */
+  @java.lang.Override
   public boolean getIsRequired() {
     return isRequired_;
   }
@@ -327,6 +335,7 @@ public boolean getIsRequired() {
    *
    * @return The order.
    */
+  @java.lang.Override
   public int getOrder() {
     return order_;
   }
@@ -1164,6 +1173,7 @@ public com.google.cloud.datacatalog.v1.FieldTypeOrBuilder getTypeOrBuilder() {
      *
      * @return The isRequired.
      */
+    @java.lang.Override
     public boolean getIsRequired() {
       return isRequired_;
     }
@@ -1218,6 +1228,7 @@ public Builder clearIsRequired() {
      *
      * @return The order.
      */
+    @java.lang.Override
     public int getOrder() {
       return order_;
     }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryGroupRequest.java
index af6dd567..21e9ef4e 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryGroupRequest.java
@@ -149,6 +149,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the entryGroup field is set.
    */
+  @java.lang.Override
   public boolean hasEntryGroup() {
     return entryGroup_ != null;
   }
@@ -165,6 +166,7 @@ public boolean hasEntryGroup() {
    *
    * @return The entryGroup.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroup() {
     return entryGroup_ == null
         ? com.google.cloud.datacatalog.v1.EntryGroup.getDefaultInstance()
@@ -181,6 +183,7 @@ public com.google.cloud.datacatalog.v1.EntryGroup getEntryGroup() {
    * .google.cloud.datacatalog.v1.EntryGroup entry_group = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryGroupOrBuilder getEntryGroupOrBuilder() {
     return getEntryGroup();
   }
@@ -199,6 +202,7 @@ public com.google.cloud.datacatalog.v1.EntryGroupOrBuilder getEntryGroupOrBuilde
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -214,6 +218,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -227,6 +232,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryRequest.java
index f25b684c..fc76167e 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateEntryRequest.java
@@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the entry field is set.
    */
+  @java.lang.Override
   public boolean hasEntry() {
     return entry_ != null;
   }
@@ -163,6 +164,7 @@ public boolean hasEntry() {
    *
    * @return The entry.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Entry getEntry() {
     return entry_ == null ? com.google.cloud.datacatalog.v1.Entry.getDefaultInstance() : entry_;
   }
@@ -176,6 +178,7 @@ public com.google.cloud.datacatalog.v1.Entry getEntry() {
    * <code>.google.cloud.datacatalog.v1.Entry entry = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.EntryOrBuilder getEntryOrBuilder() {
     return getEntry();
   }
@@ -211,6 +214,7 @@ public com.google.cloud.datacatalog.v1.EntryOrBuilder getEntryOrBuilder() {
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -243,6 +247,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -273,6 +278,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagRequest.java
index fb46238c..2dc67eb2 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagRequest.java
@@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the tag field is set.
    */
+  @java.lang.Override
   public boolean hasTag() {
     return tag_ != null;
   }
@@ -163,6 +164,7 @@ public boolean hasTag() {
    *
    * @return The tag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.Tag getTag() {
     return tag_ == null ? com.google.cloud.datacatalog.v1.Tag.getDefaultInstance() : tag_;
   }
@@ -176,6 +178,7 @@ public com.google.cloud.datacatalog.v1.Tag getTag() {
    * <code>.google.cloud.datacatalog.v1.Tag tag = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagOrBuilder getTagOrBuilder() {
     return getTag();
   }
@@ -194,6 +197,7 @@ public com.google.cloud.datacatalog.v1.TagOrBuilder getTagOrBuilder() {
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -209,6 +213,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -222,6 +227,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateFieldRequest.java
index e2323933..ca5c4f56 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateFieldRequest.java
@@ -159,6 +159,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) {
@@ -184,6 +185,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) {
@@ -211,6 +213,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return Whether the tagTemplateField field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplateField() {
     return tagTemplateField_ != null;
   }
@@ -227,6 +230,7 @@ public boolean hasTagTemplateField() {
    *
    * @return The tagTemplateField.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateField getTagTemplateField() {
     return tagTemplateField_ == null
         ? com.google.cloud.datacatalog.v1.TagTemplateField.getDefaultInstance()
@@ -243,6 +247,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateField getTagTemplateField() {
    * .google.cloud.datacatalog.v1.TagTemplateField tag_template_field = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateFieldOrBuilder getTagTemplateFieldOrBuilder() {
     return getTagTemplateField();
   }
@@ -271,6 +276,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateFieldOrBuilder getTagTemplateF
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -296,6 +302,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -319,6 +326,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    * <code>.google.protobuf.FieldMask update_mask = 3 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateRequest.java
index 2e298d38..01bde153 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/UpdateTagTemplateRequest.java
@@ -149,6 +149,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the tagTemplate field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplate() {
     return tagTemplate_ != null;
   }
@@ -165,6 +166,7 @@ public boolean hasTagTemplate() {
    *
    * @return The tagTemplate.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplate getTagTemplate() {
     return tagTemplate_ == null
         ? com.google.cloud.datacatalog.v1.TagTemplate.getDefaultInstance()
@@ -181,6 +183,7 @@ public com.google.cloud.datacatalog.v1.TagTemplate getTagTemplate() {
    * .google.cloud.datacatalog.v1.TagTemplate tag_template = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1.TagTemplateOrBuilder getTagTemplateOrBuilder() {
     return getTagTemplate();
   }
@@ -201,6 +204,7 @@ public com.google.cloud.datacatalog.v1.TagTemplateOrBuilder getTagTemplateOrBuil
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -218,6 +222,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -233,6 +238,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ViewSpec.java b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ViewSpec.java
index 3ec532a2..76dd7a5d 100644
--- a/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ViewSpec.java
+++ b/proto-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/ViewSpec.java
@@ -124,6 +124,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The viewQuery.
    */
+  @java.lang.Override
   public java.lang.String getViewQuery() {
     java.lang.Object ref = viewQuery_;
     if (ref instanceof java.lang.String) {
@@ -146,6 +147,7 @@ public java.lang.String getViewQuery() {
    *
    * @return The bytes for viewQuery.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getViewQueryBytes() {
     java.lang.Object ref = viewQuery_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryDateShardedSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryDateShardedSpec.java
index d4abab66..2fd79cc4 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryDateShardedSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryDateShardedSpec.java
@@ -143,6 +143,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The dataset.
    */
+  @java.lang.Override
   public java.lang.String getDataset() {
     java.lang.Object ref = dataset_;
     if (ref instanceof java.lang.String) {
@@ -169,6 +170,7 @@ public java.lang.String getDataset() {
    *
    * @return The bytes for dataset.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDatasetBytes() {
     java.lang.Object ref = dataset_;
     if (ref instanceof java.lang.String) {
@@ -196,6 +198,7 @@ public com.google.protobuf.ByteString getDatasetBytes() {
    *
    * @return The tablePrefix.
    */
+  @java.lang.Override
   public java.lang.String getTablePrefix() {
     java.lang.Object ref = tablePrefix_;
     if (ref instanceof java.lang.String) {
@@ -220,6 +223,7 @@ public java.lang.String getTablePrefix() {
    *
    * @return The bytes for tablePrefix.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTablePrefixBytes() {
     java.lang.Object ref = tablePrefix_;
     if (ref instanceof java.lang.String) {
@@ -245,6 +249,7 @@ public com.google.protobuf.ByteString getTablePrefixBytes() {
    *
    * @return The shardCount.
    */
+  @java.lang.Override
   public long getShardCount() {
     return shardCount_;
   }
@@ -857,6 +862,7 @@ public Builder setTablePrefixBytes(com.google.protobuf.ByteString value) {
      *
      * @return The shardCount.
      */
+    @java.lang.Override
     public long getShardCount() {
       return shardCount_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryTableSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryTableSpec.java
index 8d97c41f..1ad2064c 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryTableSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/BigQueryTableSpec.java
@@ -207,6 +207,7 @@ public TypeSpecCase getTypeSpecCase() {
    *
    * @return The enum numeric value on the wire for tableSourceType.
    */
+  @java.lang.Override
   public int getTableSourceTypeValue() {
     return tableSourceType_;
   }
@@ -223,6 +224,7 @@ public int getTableSourceTypeValue() {
    *
    * @return The tableSourceType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TableSourceType getTableSourceType() {
     @SuppressWarnings("deprecation")
     com.google.cloud.datacatalog.v1beta1.TableSourceType result =
@@ -245,6 +247,7 @@ public com.google.cloud.datacatalog.v1beta1.TableSourceType getTableSourceType()
    *
    * @return Whether the viewSpec field is set.
    */
+  @java.lang.Override
   public boolean hasViewSpec() {
     return typeSpecCase_ == 2;
   }
@@ -260,6 +263,7 @@ public boolean hasViewSpec() {
    *
    * @return The viewSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ViewSpec getViewSpec() {
     if (typeSpecCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.ViewSpec) typeSpec_;
@@ -276,6 +280,7 @@ public com.google.cloud.datacatalog.v1beta1.ViewSpec getViewSpec() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.ViewSpec view_spec = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ViewSpecOrBuilder getViewSpecOrBuilder() {
     if (typeSpecCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.ViewSpec) typeSpec_;
@@ -296,6 +301,7 @@ public com.google.cloud.datacatalog.v1beta1.ViewSpecOrBuilder getViewSpecOrBuild
    *
    * @return Whether the tableSpec field is set.
    */
+  @java.lang.Override
   public boolean hasTableSpec() {
     return typeSpecCase_ == 3;
   }
@@ -311,6 +317,7 @@ public boolean hasTableSpec() {
    *
    * @return The tableSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TableSpec getTableSpec() {
     if (typeSpecCase_ == 3) {
       return (com.google.cloud.datacatalog.v1beta1.TableSpec) typeSpec_;
@@ -327,6 +334,7 @@ public com.google.cloud.datacatalog.v1beta1.TableSpec getTableSpec() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.TableSpec table_spec = 3;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TableSpecOrBuilder getTableSpecOrBuilder() {
     if (typeSpecCase_ == 3) {
       return (com.google.cloud.datacatalog.v1beta1.TableSpec) typeSpec_;
@@ -756,6 +764,7 @@ public Builder clearTypeSpec() {
      *
      * @return The enum numeric value on the wire for tableSourceType.
      */
+    @java.lang.Override
     public int getTableSourceTypeValue() {
       return tableSourceType_;
     }
@@ -774,6 +783,7 @@ public int getTableSourceTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setTableSourceTypeValue(int value) {
+
       tableSourceType_ = value;
       onChanged();
       return this;
@@ -791,6 +801,7 @@ public Builder setTableSourceTypeValue(int value) {
      *
      * @return The tableSourceType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TableSourceType getTableSourceType() {
       @SuppressWarnings("deprecation")
       com.google.cloud.datacatalog.v1beta1.TableSourceType result =
@@ -859,6 +870,7 @@ public Builder clearTableSourceType() {
      *
      * @return Whether the viewSpec field is set.
      */
+    @java.lang.Override
     public boolean hasViewSpec() {
       return typeSpecCase_ == 2;
     }
@@ -874,6 +886,7 @@ public boolean hasViewSpec() {
      *
      * @return The viewSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.ViewSpec getViewSpec() {
       if (viewSpecBuilder_ == null) {
         if (typeSpecCase_ == 2) {
@@ -1012,6 +1025,7 @@ public com.google.cloud.datacatalog.v1beta1.ViewSpec.Builder getViewSpecBuilder(
      *
      * <code>.google.cloud.datacatalog.v1beta1.ViewSpec view_spec = 2;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.ViewSpecOrBuilder getViewSpecOrBuilder() {
       if ((typeSpecCase_ == 2) && (viewSpecBuilder_ != null)) {
         return viewSpecBuilder_.getMessageOrBuilder();
@@ -1074,6 +1088,7 @@ public com.google.cloud.datacatalog.v1beta1.ViewSpecOrBuilder getViewSpecOrBuild
      *
      * @return Whether the tableSpec field is set.
      */
+    @java.lang.Override
     public boolean hasTableSpec() {
       return typeSpecCase_ == 3;
     }
@@ -1089,6 +1104,7 @@ public boolean hasTableSpec() {
      *
      * @return The tableSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TableSpec getTableSpec() {
       if (tableSpecBuilder_ == null) {
         if (typeSpecCase_ == 3) {
@@ -1227,6 +1243,7 @@ public com.google.cloud.datacatalog.v1beta1.TableSpec.Builder getTableSpecBuilde
      *
      * <code>.google.cloud.datacatalog.v1beta1.TableSpec table_spec = 3;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TableSpecOrBuilder getTableSpecOrBuilder() {
       if ((typeSpecCase_ == 3) && (tableSpecBuilder_ != null)) {
         return tableSpecBuilder_.getMessageOrBuilder();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ColumnSchema.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ColumnSchema.java
index f2f18a7e..1b28d288 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ColumnSchema.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ColumnSchema.java
@@ -167,6 +167,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The column.
    */
+  @java.lang.Override
   public java.lang.String getColumn() {
     java.lang.Object ref = column_;
     if (ref instanceof java.lang.String) {
@@ -189,6 +190,7 @@ public java.lang.String getColumn() {
    *
    * @return The bytes for column.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getColumnBytes() {
     java.lang.Object ref = column_;
     if (ref instanceof java.lang.String) {
@@ -214,6 +216,7 @@ public com.google.protobuf.ByteString getColumnBytes() {
    *
    * @return The type.
    */
+  @java.lang.Override
   public java.lang.String getType() {
     java.lang.Object ref = type_;
     if (ref instanceof java.lang.String) {
@@ -236,6 +239,7 @@ public java.lang.String getType() {
    *
    * @return The bytes for type.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTypeBytes() {
     java.lang.Object ref = type_;
     if (ref instanceof java.lang.String) {
@@ -261,6 +265,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -283,6 +288,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -310,6 +316,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return The mode.
    */
+  @java.lang.Override
   public java.lang.String getMode() {
     java.lang.Object ref = mode_;
     if (ref instanceof java.lang.String) {
@@ -334,6 +341,7 @@ public java.lang.String getMode() {
    *
    * @return The bytes for mode.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getModeBytes() {
     java.lang.Object ref = mode_;
     if (ref instanceof java.lang.String) {
@@ -359,6 +367,7 @@ public com.google.protobuf.ByteString getModeBytes() {
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getSubcolumnsList() {
     return subcolumns_;
   }
@@ -373,6 +382,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getSubc
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.ColumnSchemaOrBuilder>
       getSubcolumnsOrBuilderList() {
     return subcolumns_;
@@ -388,6 +398,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getSubc
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public int getSubcolumnsCount() {
     return subcolumns_.size();
   }
@@ -402,6 +413,7 @@ public int getSubcolumnsCount() {
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ColumnSchema getSubcolumns(int index) {
     return subcolumns_.get(index);
   }
@@ -416,6 +428,7 @@ public com.google.cloud.datacatalog.v1beta1.ColumnSchema getSubcolumns(int index
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema subcolumns = 7 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ColumnSchemaOrBuilder getSubcolumnsOrBuilder(
       int index) {
     return subcolumns_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryGroupRequest.java
index ed217577..c1890cc9 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryGroupRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -208,6 +210,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The entryGroupId.
    */
+  @java.lang.Override
   public java.lang.String getEntryGroupId() {
     java.lang.Object ref = entryGroupId_;
     if (ref instanceof java.lang.String) {
@@ -232,6 +235,7 @@ public java.lang.String getEntryGroupId() {
    *
    * @return The bytes for entryGroupId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEntryGroupIdBytes() {
     java.lang.Object ref = entryGroupId_;
     if (ref instanceof java.lang.String) {
@@ -257,6 +261,7 @@ public com.google.protobuf.ByteString getEntryGroupIdBytes() {
    *
    * @return Whether the entryGroup field is set.
    */
+  @java.lang.Override
   public boolean hasEntryGroup() {
     return entryGroup_ != null;
   }
@@ -271,6 +276,7 @@ public boolean hasEntryGroup() {
    *
    * @return The entryGroup.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroup() {
     return entryGroup_ == null
         ? com.google.cloud.datacatalog.v1beta1.EntryGroup.getDefaultInstance()
@@ -285,6 +291,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroup() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.EntryGroup entry_group = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder getEntryGroupOrBuilder() {
     return getEntryGroup();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryRequest.java
index 9cfecdcf..e7502643 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateEntryRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -206,6 +208,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The entryId.
    */
+  @java.lang.Override
   public java.lang.String getEntryId() {
     java.lang.Object ref = entryId_;
     if (ref instanceof java.lang.String) {
@@ -228,6 +231,7 @@ public java.lang.String getEntryId() {
    *
    * @return The bytes for entryId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getEntryIdBytes() {
     java.lang.Object ref = entryId_;
     if (ref instanceof java.lang.String) {
@@ -255,6 +259,7 @@ public com.google.protobuf.ByteString getEntryIdBytes() {
    *
    * @return Whether the entry field is set.
    */
+  @java.lang.Override
   public boolean hasEntry() {
     return entry_ != null;
   }
@@ -271,6 +276,7 @@ public boolean hasEntry() {
    *
    * @return The entry.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Entry getEntry() {
     return entry_ == null
         ? com.google.cloud.datacatalog.v1beta1.Entry.getDefaultInstance()
@@ -287,6 +293,7 @@ public com.google.cloud.datacatalog.v1beta1.Entry getEntry() {
    * .google.cloud.datacatalog.v1beta1.Entry entry = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryOrBuilder getEntryOrBuilder() {
     return getEntry();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreatePolicyTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreatePolicyTagRequest.java
index 670ab40f..99ad14d0 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreatePolicyTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreatePolicyTagRequest.java
@@ -143,6 +143,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -167,6 +168,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -192,6 +194,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return Whether the policyTag field is set.
    */
+  @java.lang.Override
   public boolean hasPolicyTag() {
     return policyTag_ != null;
   }
@@ -206,6 +209,7 @@ public boolean hasPolicyTag() {
    *
    * @return The policyTag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTag() {
     return policyTag_ == null
         ? com.google.cloud.datacatalog.v1beta1.PolicyTag.getDefaultInstance()
@@ -220,6 +224,7 @@ public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTag() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.PolicyTag policy_tag = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder getPolicyTagOrBuilder() {
     return getPolicyTag();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagRequest.java
index cd91e4d8..0931c48c 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagRequest.java
@@ -147,6 +147,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -175,6 +176,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -201,6 +203,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return Whether the tag field is set.
    */
+  @java.lang.Override
   public boolean hasTag() {
     return tag_ != null;
   }
@@ -216,6 +219,7 @@ public boolean hasTag() {
    *
    * @return The tag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Tag getTag() {
     return tag_ == null ? com.google.cloud.datacatalog.v1beta1.Tag.getDefaultInstance() : tag_;
   }
@@ -229,6 +233,7 @@ public com.google.cloud.datacatalog.v1beta1.Tag getTag() {
    * <code>.google.cloud.datacatalog.v1beta1.Tag tag = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagOrBuilder getTagOrBuilder() {
     return getTag();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateFieldRequest.java
index 7ad8e8ec..aa3746ed 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateFieldRequest.java
@@ -155,6 +155,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -182,6 +183,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -211,6 +213,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The tagTemplateFieldId.
    */
+  @java.lang.Override
   public java.lang.String getTagTemplateFieldId() {
     java.lang.Object ref = tagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -237,6 +240,7 @@ public java.lang.String getTagTemplateFieldId() {
    *
    * @return The bytes for tagTemplateFieldId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTagTemplateFieldIdBytes() {
     java.lang.Object ref = tagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -264,6 +268,7 @@ public com.google.protobuf.ByteString getTagTemplateFieldIdBytes() {
    *
    * @return Whether the tagTemplateField field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplateField() {
     return tagTemplateField_ != null;
   }
@@ -280,6 +285,7 @@ public boolean hasTagTemplateField() {
    *
    * @return The tagTemplateField.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateField getTagTemplateField() {
     return tagTemplateField_ == null
         ? com.google.cloud.datacatalog.v1beta1.TagTemplateField.getDefaultInstance()
@@ -296,6 +302,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateField getTagTemplateField
    * .google.cloud.datacatalog.v1beta1.TagTemplateField tag_template_field = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateFieldOrBuilder
       getTagTemplateFieldOrBuilder() {
     return getTagTemplateField();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateRequest.java
index fd07471b..12dc6a13 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTagTemplateRequest.java
@@ -154,6 +154,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -181,6 +182,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -206,6 +208,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The tagTemplateId.
    */
+  @java.lang.Override
   public java.lang.String getTagTemplateId() {
     java.lang.Object ref = tagTemplateId_;
     if (ref instanceof java.lang.String) {
@@ -228,6 +231,7 @@ public java.lang.String getTagTemplateId() {
    *
    * @return The bytes for tagTemplateId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTagTemplateIdBytes() {
     java.lang.Object ref = tagTemplateId_;
     if (ref instanceof java.lang.String) {
@@ -255,6 +259,7 @@ public com.google.protobuf.ByteString getTagTemplateIdBytes() {
    *
    * @return Whether the tagTemplate field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplate() {
     return tagTemplate_ != null;
   }
@@ -271,6 +276,7 @@ public boolean hasTagTemplate() {
    *
    * @return The tagTemplate.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplate getTagTemplate() {
     return tagTemplate_ == null
         ? com.google.cloud.datacatalog.v1beta1.TagTemplate.getDefaultInstance()
@@ -287,6 +293,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplate getTagTemplate() {
    * .google.cloud.datacatalog.v1beta1.TagTemplate tag_template = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateOrBuilder getTagTemplateOrBuilder() {
     return getTagTemplate();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTaxonomyRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTaxonomyRequest.java
index c1715593..bf48cd08 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTaxonomyRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/CreateTaxonomyRequest.java
@@ -143,6 +143,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -167,6 +168,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -192,6 +194,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return Whether the taxonomy field is set.
    */
+  @java.lang.Override
   public boolean hasTaxonomy() {
     return taxonomy_ != null;
   }
@@ -206,6 +209,7 @@ public boolean hasTaxonomy() {
    *
    * @return The taxonomy.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomy() {
     return taxonomy_ == null
         ? com.google.cloud.datacatalog.v1beta1.Taxonomy.getDefaultInstance()
@@ -220,6 +224,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomy() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.Taxonomy taxonomy = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomyOrBuilder() {
     return getTaxonomy();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryGroupRequest.java
index 17c76097..e37fed1b 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryGroupRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -183,6 +185,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -657,6 +660,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryRequest.java
index 1987bb0d..86877e9d 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteEntryRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeletePolicyTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeletePolicyTagRequest.java
index 35de23b6..ebfdc1f4 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeletePolicyTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeletePolicyTagRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagRequest.java
index 51c47c79..43a2d8f6 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateFieldRequest.java
index e4637928..3a20c59b 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateFieldRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -185,6 +187,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -667,6 +670,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateRequest.java
index be0bff60..7d3afcef 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTagTemplateRequest.java
@@ -133,6 +133,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) {
@@ -158,6 +159,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) {
@@ -185,6 +187,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The force.
    */
+  @java.lang.Override
   public boolean getForce() {
     return force_;
   }
@@ -662,6 +665,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      * @return The force.
      */
+    @java.lang.Override
     public boolean getForce() {
       return force_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTaxonomyRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTaxonomyRequest.java
index 3c04afc4..9d1ff4de 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTaxonomyRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DeleteTaxonomyRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Entry.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Entry.java
index 0add26a9..41991b2e 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Entry.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Entry.java
@@ -424,6 +424,7 @@ public TypeSpecCase getTypeSpecCase() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -449,6 +450,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) {
@@ -482,6 +484,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The linkedResource.
    */
+  @java.lang.Override
   public java.lang.String getLinkedResource() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -512,6 +515,7 @@ public java.lang.String getLinkedResource() {
    *
    * @return The bytes for linkedResource.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getLinkedResourceBytes() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -762,6 +766,7 @@ public com.google.protobuf.ByteString getUserSpecifiedSystemBytes() {
    *
    * @return Whether the gcsFilesetSpec field is set.
    */
+  @java.lang.Override
   public boolean hasGcsFilesetSpec() {
     return typeSpecCase_ == 6;
   }
@@ -777,6 +782,7 @@ public boolean hasGcsFilesetSpec() {
    *
    * @return The gcsFilesetSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec getGcsFilesetSpec() {
     if (typeSpecCase_ == 6) {
       return (com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec) typeSpec_;
@@ -793,6 +799,7 @@ public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec getGcsFilesetSpec() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.GcsFilesetSpec gcs_fileset_spec = 6;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpecOrBuilder getGcsFilesetSpecOrBuilder() {
     if (typeSpecCase_ == 6) {
       return (com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec) typeSpec_;
@@ -813,6 +820,7 @@ public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpecOrBuilder getGcsFilese
    *
    * @return Whether the bigqueryTableSpec field is set.
    */
+  @java.lang.Override
   public boolean hasBigqueryTableSpec() {
     return typeSpecCase_ == 12;
   }
@@ -828,6 +836,7 @@ public boolean hasBigqueryTableSpec() {
    *
    * @return The bigqueryTableSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpec getBigqueryTableSpec() {
     if (typeSpecCase_ == 12) {
       return (com.google.cloud.datacatalog.v1beta1.BigQueryTableSpec) typeSpec_;
@@ -844,6 +853,7 @@ public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpec getBigqueryTableSp
    *
    * <code>.google.cloud.datacatalog.v1beta1.BigQueryTableSpec bigquery_table_spec = 12;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpecOrBuilder
       getBigqueryTableSpecOrBuilder() {
     if (typeSpecCase_ == 12) {
@@ -868,6 +878,7 @@ public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpec getBigqueryTableSp
    *
    * @return Whether the bigqueryDateShardedSpec field is set.
    */
+  @java.lang.Override
   public boolean hasBigqueryDateShardedSpec() {
     return typeSpecCase_ == 15;
   }
@@ -886,6 +897,7 @@ public boolean hasBigqueryDateShardedSpec() {
    *
    * @return The bigqueryDateShardedSpec.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec getBigqueryDateShardedSpec() {
     if (typeSpecCase_ == 15) {
       return (com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec) typeSpec_;
@@ -905,6 +917,7 @@ public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec getBigqueryD
    * .google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec bigquery_date_sharded_spec = 15;
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpecOrBuilder
       getBigqueryDateShardedSpecOrBuilder() {
     if (typeSpecCase_ == 15) {
@@ -928,6 +941,7 @@ public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec getBigqueryD
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -952,6 +966,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -978,6 +993,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -1001,6 +1017,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -1026,6 +1043,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return Whether the schema field is set.
    */
+  @java.lang.Override
   public boolean hasSchema() {
     return schema_ != null;
   }
@@ -1040,6 +1058,7 @@ public boolean hasSchema() {
    *
    * @return The schema.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Schema getSchema() {
     return schema_ == null
         ? com.google.cloud.datacatalog.v1beta1.Schema.getDefaultInstance()
@@ -1054,6 +1073,7 @@ public com.google.cloud.datacatalog.v1beta1.Schema getSchema() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.Schema schema = 5;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SchemaOrBuilder getSchemaOrBuilder() {
     return getSchema();
   }
@@ -1076,6 +1096,7 @@ public com.google.cloud.datacatalog.v1beta1.SchemaOrBuilder getSchemaOrBuilder()
    *
    * @return Whether the sourceSystemTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasSourceSystemTimestamps() {
     return sourceSystemTimestamps_ != null;
   }
@@ -1095,6 +1116,7 @@ public boolean hasSourceSystemTimestamps() {
    *
    * @return The sourceSystemTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getSourceSystemTimestamps() {
     return sourceSystemTimestamps_ == null
         ? com.google.cloud.datacatalog.v1beta1.SystemTimestamps.getDefaultInstance()
@@ -1114,6 +1136,7 @@ public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getSourceSystemTime
    * .google.cloud.datacatalog.v1beta1.SystemTimestamps source_system_timestamps = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestampsOrBuilder
       getSourceSystemTimestampsOrBuilder() {
     return getSourceSystemTimestamps();
@@ -2096,6 +2119,7 @@ public Builder setLinkedResourceBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for type.
      */
+    @java.lang.Override
     public int getTypeValue() {
       if (entryTypeCase_ == 2) {
         return ((java.lang.Integer) entryType_).intValue();
@@ -2133,6 +2157,7 @@ public Builder setTypeValue(int value) {
      *
      * @return The type.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.EntryType getType() {
       if (entryTypeCase_ == 2) {
         @SuppressWarnings("deprecation")
@@ -2206,6 +2231,7 @@ public Builder clearType() {
      *
      * @return The userSpecifiedType.
      */
+    @java.lang.Override
     public java.lang.String getUserSpecifiedType() {
       java.lang.Object ref = "";
       if (entryTypeCase_ == 16) {
@@ -2241,6 +2267,7 @@ public java.lang.String getUserSpecifiedType() {
      *
      * @return The bytes for userSpecifiedType.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getUserSpecifiedTypeBytes() {
       java.lang.Object ref = "";
       if (entryTypeCase_ == 16) {
@@ -2358,6 +2385,7 @@ public Builder setUserSpecifiedTypeBytes(com.google.protobuf.ByteString value) {
      *
      * @return The enum numeric value on the wire for integratedSystem.
      */
+    @java.lang.Override
     public int getIntegratedSystemValue() {
       if (systemCase_ == 17) {
         return ((java.lang.Integer) system_).intValue();
@@ -2399,6 +2427,7 @@ public Builder setIntegratedSystemValue(int value) {
      *
      * @return The integratedSystem.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.IntegratedSystem getIntegratedSystem() {
       if (systemCase_ == 17) {
         @SuppressWarnings("deprecation")
@@ -2474,6 +2503,7 @@ public Builder clearIntegratedSystem() {
      *
      * @return The userSpecifiedSystem.
      */
+    @java.lang.Override
     public java.lang.String getUserSpecifiedSystem() {
       java.lang.Object ref = "";
       if (systemCase_ == 18) {
@@ -2505,6 +2535,7 @@ public java.lang.String getUserSpecifiedSystem() {
      *
      * @return The bytes for userSpecifiedSystem.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getUserSpecifiedSystemBytes() {
       java.lang.Object ref = "";
       if (systemCase_ == 18) {
@@ -2613,6 +2644,7 @@ public Builder setUserSpecifiedSystemBytes(com.google.protobuf.ByteString value)
      *
      * @return Whether the gcsFilesetSpec field is set.
      */
+    @java.lang.Override
     public boolean hasGcsFilesetSpec() {
       return typeSpecCase_ == 6;
     }
@@ -2628,6 +2660,7 @@ public boolean hasGcsFilesetSpec() {
      *
      * @return The gcsFilesetSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec getGcsFilesetSpec() {
       if (gcsFilesetSpecBuilder_ == null) {
         if (typeSpecCase_ == 6) {
@@ -2767,6 +2800,7 @@ public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec.Builder getGcsFileset
      *
      * <code>.google.cloud.datacatalog.v1beta1.GcsFilesetSpec gcs_fileset_spec = 6;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpecOrBuilder
         getGcsFilesetSpecOrBuilder() {
       if ((typeSpecCase_ == 6) && (gcsFilesetSpecBuilder_ != null)) {
@@ -2830,6 +2864,7 @@ public com.google.cloud.datacatalog.v1beta1.GcsFilesetSpec.Builder getGcsFileset
      *
      * @return Whether the bigqueryTableSpec field is set.
      */
+    @java.lang.Override
     public boolean hasBigqueryTableSpec() {
       return typeSpecCase_ == 12;
     }
@@ -2845,6 +2880,7 @@ public boolean hasBigqueryTableSpec() {
      *
      * @return The bigqueryTableSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpec getBigqueryTableSpec() {
       if (bigqueryTableSpecBuilder_ == null) {
         if (typeSpecCase_ == 12) {
@@ -2987,6 +3023,7 @@ public Builder clearBigqueryTableSpec() {
      *
      * <code>.google.cloud.datacatalog.v1beta1.BigQueryTableSpec bigquery_table_spec = 12;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.BigQueryTableSpecOrBuilder
         getBigqueryTableSpecOrBuilder() {
       if ((typeSpecCase_ == 12) && (bigqueryTableSpecBuilder_ != null)) {
@@ -3053,6 +3090,7 @@ public Builder clearBigqueryTableSpec() {
      *
      * @return Whether the bigqueryDateShardedSpec field is set.
      */
+    @java.lang.Override
     public boolean hasBigqueryDateShardedSpec() {
       return typeSpecCase_ == 15;
     }
@@ -3071,6 +3109,7 @@ public boolean hasBigqueryDateShardedSpec() {
      *
      * @return The bigqueryDateShardedSpec.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec
         getBigqueryDateShardedSpec() {
       if (bigqueryDateShardedSpecBuilder_ == null) {
@@ -3233,6 +3272,7 @@ public Builder clearBigqueryDateShardedSpec() {
      * .google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpec bigquery_date_sharded_spec = 15;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.BigQueryDateShardedSpecOrBuilder
         getBigqueryDateShardedSpecOrBuilder() {
       if ((typeSpecCase_ == 15) && (bigqueryDateShardedSpecBuilder_ != null)) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryGroup.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryGroup.java
index 082907a3..c732511d 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryGroup.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryGroup.java
@@ -162,6 +162,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) {
@@ -187,6 +188,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) {
@@ -213,6 +215,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -236,6 +239,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -263,6 +267,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -287,6 +292,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -314,6 +320,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return Whether the dataCatalogTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasDataCatalogTimestamps() {
     return dataCatalogTimestamps_ != null;
   }
@@ -330,6 +337,7 @@ public boolean hasDataCatalogTimestamps() {
    *
    * @return The dataCatalogTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getDataCatalogTimestamps() {
     return dataCatalogTimestamps_ == null
         ? com.google.cloud.datacatalog.v1beta1.SystemTimestamps.getDefaultInstance()
@@ -346,6 +354,7 @@ public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getDataCatalogTimes
    * .google.cloud.datacatalog.v1beta1.SystemTimestamps data_catalog_timestamps = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestampsOrBuilder
       getDataCatalogTimestampsOrBuilder() {
     return getDataCatalogTimestamps();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryType.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryType.java
index 4696bce1..5897f1b1 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryType.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/EntryType.java
@@ -193,6 +193,10 @@ public EntryType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesRequest.java
index c8fec753..759d83cc 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesRequest.java
@@ -193,6 +193,7 @@ public DestinationCase getDestinationCase() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -218,6 +219,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -311,6 +313,7 @@ public com.google.protobuf.ByteString getTaxonomiesBytes(int index) {
    *
    * @return The serializedTaxonomies.
    */
+  @java.lang.Override
   public boolean getSerializedTaxonomies() {
     if (destinationCase_ == 3) {
       return (java.lang.Boolean) destination_;
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesResponse.java
index 2f8dcbdf..5d9a7b9a 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ExportTaxonomiesResponse.java
@@ -134,6 +134,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy>
       getTaxonomiesList() {
     return taxonomies_;
@@ -147,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.SerializedTaxonomyOrBuilder>
       getTaxonomiesOrBuilderList() {
     return taxonomies_;
@@ -160,6 +162,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public int getTaxonomiesCount() {
     return taxonomies_.size();
   }
@@ -172,6 +175,7 @@ public int getTaxonomiesCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy getTaxonomies(int index) {
     return taxonomies_.get(index);
   }
@@ -184,6 +188,7 @@ public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy getTaxonomies(int
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomyOrBuilder getTaxonomiesOrBuilder(
       int index) {
     return taxonomies_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/FieldType.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/FieldType.java
index 57d634f0..eb32f315 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/FieldType.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/FieldType.java
@@ -278,6 +278,10 @@ public PrimitiveType 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());
     }
 
@@ -630,6 +634,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        *
        * @return The displayName.
        */
+      @java.lang.Override
       public java.lang.String getDisplayName() {
         java.lang.Object ref = displayName_;
         if (ref instanceof java.lang.String) {
@@ -652,6 +657,7 @@ public java.lang.String getDisplayName() {
        *
        * @return The bytes for displayName.
        */
+      @java.lang.Override
       public com.google.protobuf.ByteString getDisplayNameBytes() {
         java.lang.Object ref = displayName_;
         if (ref instanceof java.lang.String) {
@@ -1168,6 +1174,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * repeated .google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public java.util.List<com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue>
         getAllowedValuesList() {
       return allowedValues_;
@@ -1188,6 +1195,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * repeated .google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public java.util.List<
             ? extends com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValueOrBuilder>
         getAllowedValuesOrBuilderList() {
@@ -1209,6 +1217,7 @@ public com.google.protobuf.Parser<EnumValue> getParserForType() {
      * repeated .google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public int getAllowedValuesCount() {
       return allowedValues_.size();
     }
@@ -1228,6 +1237,7 @@ public int getAllowedValuesCount() {
      * repeated .google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue getAllowedValues(
         int index) {
       return allowedValues_.get(index);
@@ -1248,6 +1258,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue getAllo
      * repeated .google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValue allowed_values = 1;
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.EnumValueOrBuilder
         getAllowedValuesOrBuilder(int index) {
       return allowedValues_.get(index);
@@ -2268,6 +2279,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldType.PrimitiveType getPrimitive
    *
    * @return Whether the enumType field is set.
    */
+  @java.lang.Override
   public boolean hasEnumType() {
     return typeDeclCase_ == 2;
   }
@@ -2282,6 +2294,7 @@ public boolean hasEnumType() {
    *
    * @return The enumType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType getEnumType() {
     if (typeDeclCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.FieldType.EnumType) typeDecl_;
@@ -2297,6 +2310,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType getEnumType() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.FieldType.EnumType enum_type = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.FieldType.EnumTypeOrBuilder getEnumTypeOrBuilder() {
     if (typeDeclCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.FieldType.EnumType) typeDecl_;
@@ -2688,6 +2702,7 @@ public Builder clearTypeDecl() {
      *
      * @return The enum numeric value on the wire for primitiveType.
      */
+    @java.lang.Override
     public int getPrimitiveTypeValue() {
       if (typeDeclCase_ == 1) {
         return ((java.lang.Integer) typeDecl_).intValue();
@@ -2723,6 +2738,7 @@ public Builder setPrimitiveTypeValue(int value) {
      *
      * @return The primitiveType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.FieldType.PrimitiveType getPrimitiveType() {
       if (typeDeclCase_ == 1) {
         @SuppressWarnings("deprecation")
@@ -2794,6 +2810,7 @@ public Builder clearPrimitiveType() {
      *
      * @return Whether the enumType field is set.
      */
+    @java.lang.Override
     public boolean hasEnumType() {
       return typeDeclCase_ == 2;
     }
@@ -2808,6 +2825,7 @@ public boolean hasEnumType() {
      *
      * @return The enumType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType getEnumType() {
       if (enumTypeBuilder_ == null) {
         if (typeDeclCase_ == 2) {
@@ -2941,6 +2959,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldType.EnumType.Builder getEnumTy
      *
      * <code>.google.cloud.datacatalog.v1beta1.FieldType.EnumType enum_type = 2;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.FieldType.EnumTypeOrBuilder getEnumTypeOrBuilder() {
       if ((typeDeclCase_ == 2) && (enumTypeBuilder_ != null)) {
         return enumTypeBuilder_.getMessageOrBuilder();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFileSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFileSpec.java
index 52f0dda8..d5260488 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFileSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFileSpec.java
@@ -146,6 +146,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The filePath.
    */
+  @java.lang.Override
   public java.lang.String getFilePath() {
     java.lang.Object ref = filePath_;
     if (ref instanceof java.lang.String) {
@@ -168,6 +169,7 @@ public java.lang.String getFilePath() {
    *
    * @return The bytes for filePath.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getFilePathBytes() {
     java.lang.Object ref = filePath_;
     if (ref instanceof java.lang.String) {
@@ -195,6 +197,7 @@ public com.google.protobuf.ByteString getFilePathBytes() {
    *
    * @return Whether the gcsTimestamps field is set.
    */
+  @java.lang.Override
   public boolean hasGcsTimestamps() {
     return gcsTimestamps_ != null;
   }
@@ -211,6 +214,7 @@ public boolean hasGcsTimestamps() {
    *
    * @return The gcsTimestamps.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getGcsTimestamps() {
     return gcsTimestamps_ == null
         ? com.google.cloud.datacatalog.v1beta1.SystemTimestamps.getDefaultInstance()
@@ -227,6 +231,7 @@ public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getGcsTimestamps()
    * .google.cloud.datacatalog.v1beta1.SystemTimestamps gcs_timestamps = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SystemTimestampsOrBuilder
       getGcsTimestampsOrBuilder() {
     return getGcsTimestamps();
@@ -245,6 +250,7 @@ public com.google.cloud.datacatalog.v1beta1.SystemTimestamps getGcsTimestamps()
    *
    * @return The sizeBytes.
    */
+  @java.lang.Override
   public long getSizeBytes() {
     return sizeBytes_;
   }
@@ -932,6 +938,7 @@ public com.google.cloud.datacatalog.v1beta1.SystemTimestamps.Builder getGcsTimes
      *
      * @return The sizeBytes.
      */
+    @java.lang.Override
     public long getSizeBytes() {
       return sizeBytes_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFilesetSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFilesetSpec.java
index e116f66c..7cab4d37 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFilesetSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GcsFilesetSpec.java
@@ -294,6 +294,7 @@ public com.google.protobuf.ByteString getFilePatternsBytes(int index) {
    * repeated .google.cloud.datacatalog.v1beta1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.GcsFileSpec>
       getSampleGcsFileSpecsList() {
     return sampleGcsFileSpecs_;
@@ -310,6 +311,7 @@ public com.google.protobuf.ByteString getFilePatternsBytes(int index) {
    * repeated .google.cloud.datacatalog.v1beta1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.GcsFileSpecOrBuilder>
       getSampleGcsFileSpecsOrBuilderList() {
     return sampleGcsFileSpecs_;
@@ -326,6 +328,7 @@ public com.google.protobuf.ByteString getFilePatternsBytes(int index) {
    * repeated .google.cloud.datacatalog.v1beta1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public int getSampleGcsFileSpecsCount() {
     return sampleGcsFileSpecs_.size();
   }
@@ -341,6 +344,7 @@ public int getSampleGcsFileSpecsCount() {
    * repeated .google.cloud.datacatalog.v1beta1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.GcsFileSpec getSampleGcsFileSpecs(int index) {
     return sampleGcsFileSpecs_.get(index);
   }
@@ -356,6 +360,7 @@ public com.google.cloud.datacatalog.v1beta1.GcsFileSpec getSampleGcsFileSpecs(in
    * repeated .google.cloud.datacatalog.v1beta1.GcsFileSpec sample_gcs_file_specs = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.GcsFileSpecOrBuilder getSampleGcsFileSpecsOrBuilder(
       int index) {
     return sampleGcsFileSpecs_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryGroupRequest.java
index 8faea42e..2bc51da1 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryGroupRequest.java
@@ -143,6 +143,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) {
@@ -168,6 +169,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) {
@@ -193,6 +195,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return Whether the readMask field is set.
    */
+  @java.lang.Override
   public boolean hasReadMask() {
     return readMask_ != null;
   }
@@ -207,6 +210,7 @@ public boolean hasReadMask() {
    *
    * @return The readMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getReadMask() {
     return readMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : readMask_;
   }
@@ -219,6 +223,7 @@ public com.google.protobuf.FieldMask getReadMask() {
    *
    * <code>.google.protobuf.FieldMask read_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getReadMaskOrBuilder() {
     return getReadMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryRequest.java
index f732f4ab..11bf8246 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetEntryRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetPolicyTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetPolicyTagRequest.java
index 9f9c944b..75f083a3 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetPolicyTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetPolicyTagRequest.java
@@ -127,6 +127,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) {
@@ -151,6 +152,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTagTemplateRequest.java
index 0efa78ed..7022ba28 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTagTemplateRequest.java
@@ -128,6 +128,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) {
@@ -153,6 +154,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTaxonomyRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTaxonomyRequest.java
index 56325b31..0eb523de 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTaxonomyRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/GetTaxonomyRequest.java
@@ -127,6 +127,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) {
@@ -151,6 +152,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-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesRequest.java
index 88c6377d..5969b7f5 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesRequest.java
@@ -190,6 +190,7 @@ public SourceCase getSourceCase() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -215,6 +216,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -239,6 +241,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return Whether the inlineSource field is set.
    */
+  @java.lang.Override
   public boolean hasInlineSource() {
     return sourceCase_ == 2;
   }
@@ -253,6 +256,7 @@ public boolean hasInlineSource() {
    *
    * @return The inlineSource.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.InlineSource getInlineSource() {
     if (sourceCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.InlineSource) source_;
@@ -268,6 +272,7 @@ public com.google.cloud.datacatalog.v1beta1.InlineSource getInlineSource() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.InlineSource inline_source = 2;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.InlineSourceOrBuilder getInlineSourceOrBuilder() {
     if (sourceCase_ == 2) {
       return (com.google.cloud.datacatalog.v1beta1.InlineSource) source_;
@@ -793,6 +798,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return Whether the inlineSource field is set.
      */
+    @java.lang.Override
     public boolean hasInlineSource() {
       return sourceCase_ == 2;
     }
@@ -807,6 +813,7 @@ public boolean hasInlineSource() {
      *
      * @return The inlineSource.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.InlineSource getInlineSource() {
       if (inlineSourceBuilder_ == null) {
         if (sourceCase_ == 2) {
@@ -939,6 +946,7 @@ public com.google.cloud.datacatalog.v1beta1.InlineSource.Builder getInlineSource
      *
      * <code>.google.cloud.datacatalog.v1beta1.InlineSource inline_source = 2;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.InlineSourceOrBuilder getInlineSourceOrBuilder() {
       if ((sourceCase_ == 2) && (inlineSourceBuilder_ != null)) {
         return inlineSourceBuilder_.getMessageOrBuilder();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesResponse.java
index 7df7c754..d56284bf 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ImportTaxonomiesResponse.java
@@ -132,6 +132,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomiesList() {
     return taxonomies_;
   }
@@ -144,6 +145,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomi
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder>
       getTaxonomiesOrBuilderList() {
     return taxonomies_;
@@ -157,6 +159,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomi
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public int getTaxonomiesCount() {
     return taxonomies_.size();
   }
@@ -169,6 +172,7 @@ public int getTaxonomiesCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomies(int index) {
     return taxonomies_.get(index);
   }
@@ -181,6 +185,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomies(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomiesOrBuilder(int index) {
     return taxonomies_.get(index);
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/InlineSource.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/InlineSource.java
index 4c6e82bb..033589ee 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/InlineSource.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/InlineSource.java
@@ -135,6 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy>
       getTaxonomiesList() {
     return taxonomies_;
@@ -150,6 +151,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.SerializedTaxonomyOrBuilder>
       getTaxonomiesOrBuilderList() {
     return taxonomies_;
@@ -165,6 +167,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public int getTaxonomiesCount() {
     return taxonomies_.size();
   }
@@ -179,6 +182,7 @@ public int getTaxonomiesCount() {
    * repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy getTaxonomies(int index) {
     return taxonomies_.get(index);
   }
@@ -193,6 +197,7 @@ public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomy getTaxonomies(int
    * repeated .google.cloud.datacatalog.v1beta1.SerializedTaxonomy taxonomies = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedTaxonomyOrBuilder getTaxonomiesOrBuilder(
       int index) {
     return taxonomies_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/IntegratedSystem.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/IntegratedSystem.java
index 299898d3..9d76441b 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/IntegratedSystem.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/IntegratedSystem.java
@@ -140,6 +140,10 @@ public IntegratedSystem 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesRequest.java
index 0ec04f62..804f7f8a 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesRequest.java
@@ -157,6 +157,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -183,6 +184,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -209,6 +211,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -227,6 +230,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -250,6 +254,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -278,6 +283,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return Whether the readMask field is set.
    */
+  @java.lang.Override
   public boolean hasReadMask() {
     return readMask_ != null;
   }
@@ -295,6 +301,7 @@ public boolean hasReadMask() {
    *
    * @return The readMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getReadMask() {
     return readMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : readMask_;
   }
@@ -310,6 +317,7 @@ public com.google.protobuf.FieldMask getReadMask() {
    *
    * <code>.google.protobuf.FieldMask read_mask = 4;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getReadMaskOrBuilder() {
     return getReadMask();
   }
@@ -832,6 +840,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesResponse.java
index 172f1c0e..d4d1f279 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntriesResponse.java
@@ -139,6 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.Entry> getEntriesList() {
     return entries_;
   }
@@ -151,6 +152,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Entry> getEntriesList
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.EntryOrBuilder>
       getEntriesOrBuilderList() {
     return entries_;
@@ -164,6 +166,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Entry> getEntriesList
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public int getEntriesCount() {
     return entries_.size();
   }
@@ -176,6 +179,7 @@ public int getEntriesCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Entry getEntries(int index) {
     return entries_.get(index);
   }
@@ -188,6 +192,7 @@ public com.google.cloud.datacatalog.v1beta1.Entry getEntries(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Entry entries = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryOrBuilder getEntriesOrBuilder(int index) {
     return entries_.get(index);
   }
@@ -206,6 +211,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryOrBuilder getEntriesOrBuilder(i
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -229,6 +235,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsRequest.java
index 32d16b3e..60facca8 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsRequest.java
@@ -142,6 +142,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -168,6 +169,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -194,6 +196,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -212,6 +215,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -235,6 +239,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -737,6 +742,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsResponse.java
index 52fae0e2..37449a7e 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListEntryGroupsResponse.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.EntryGroup> getEntryGroupsList() {
     return entryGroups_;
   }
@@ -152,6 +153,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.EntryGroup> getEntryG
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder>
       getEntryGroupsOrBuilderList() {
     return entryGroups_;
@@ -165,6 +167,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.EntryGroup> getEntryG
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public int getEntryGroupsCount() {
     return entryGroups_.size();
   }
@@ -177,6 +180,7 @@ public int getEntryGroupsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroups(int index) {
     return entryGroups_.get(index);
   }
@@ -189,6 +193,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroups(int index)
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.EntryGroup entry_groups = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder getEntryGroupsOrBuilder(
       int index) {
     return entryGroups_.get(index);
@@ -208,6 +213,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder getEntryGroupsOr
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -231,6 +237,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsRequest.java
index 16b1235a..85048d1e 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsRequest.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -164,6 +165,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -190,6 +192,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -208,6 +211,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -231,6 +235,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -723,6 +728,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsResponse.java
index a462e479..b4587dfb 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListPolicyTagsResponse.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.PolicyTag policy_tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.PolicyTag> getPolicyTagsList() {
     return policyTags_;
   }
@@ -152,6 +153,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.PolicyTag> getPolicyT
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.PolicyTag policy_tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder>
       getPolicyTagsOrBuilderList() {
     return policyTags_;
@@ -165,6 +167,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.PolicyTag> getPolicyT
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.PolicyTag policy_tags = 1;</code>
    */
+  @java.lang.Override
   public int getPolicyTagsCount() {
     return policyTags_.size();
   }
@@ -177,6 +180,7 @@ public int getPolicyTagsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.PolicyTag policy_tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTags(int index) {
     return policyTags_.get(index);
   }
@@ -189,6 +193,7 @@ public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTags(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.PolicyTag policy_tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder getPolicyTagsOrBuilder(int index) {
     return policyTags_.get(index);
   }
@@ -207,6 +212,7 @@ public com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder getPolicyTagsOrBu
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -230,6 +236,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsRequest.java
index 820d17e3..7ca1fa14 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsRequest.java
@@ -145,6 +145,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -174,6 +175,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -199,6 +201,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -217,6 +220,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -240,6 +244,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -755,6 +760,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsResponse.java
index bd309403..c6882fbc 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTagsResponse.java
@@ -139,6 +139,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.Tag> getTagsList() {
     return tags_;
   }
@@ -151,6 +152,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Tag> getTagsList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.TagOrBuilder>
       getTagsOrBuilderList() {
     return tags_;
@@ -164,6 +166,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Tag> getTagsList() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public int getTagsCount() {
     return tags_.size();
   }
@@ -176,6 +179,7 @@ public int getTagsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Tag getTags(int index) {
     return tags_.get(index);
   }
@@ -188,6 +192,7 @@ public com.google.cloud.datacatalog.v1beta1.Tag getTags(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Tag tags = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagOrBuilder getTagsOrBuilder(int index) {
     return tags_.get(index);
   }
@@ -206,6 +211,7 @@ public com.google.cloud.datacatalog.v1beta1.TagOrBuilder getTagsOrBuilder(int in
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -229,6 +235,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesRequest.java
index 040dad32..31a5da78 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesRequest.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The parent.
    */
+  @java.lang.Override
   public java.lang.String getParent() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -164,6 +165,7 @@ public java.lang.String getParent() {
    *
    * @return The bytes for parent.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentBytes() {
     java.lang.Object ref = parent_;
     if (ref instanceof java.lang.String) {
@@ -190,6 +192,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -208,6 +211,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -231,6 +235,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -723,6 +728,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesResponse.java
index 8a12ee71..2e2cd6d9 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ListTaxonomiesResponse.java
@@ -140,6 +140,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomiesList() {
     return taxonomies_;
   }
@@ -152,6 +153,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomi
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder>
       getTaxonomiesOrBuilderList() {
     return taxonomies_;
@@ -165,6 +167,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy> getTaxonomi
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public int getTaxonomiesCount() {
     return taxonomies_.size();
   }
@@ -177,6 +180,7 @@ public int getTaxonomiesCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomies(int index) {
     return taxonomies_.get(index);
   }
@@ -189,6 +193,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomies(int index) {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.Taxonomy taxonomies = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomiesOrBuilder(int index) {
     return taxonomies_.get(index);
   }
@@ -207,6 +212,7 @@ public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomiesOrBui
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -230,6 +236,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/LookupEntryRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/LookupEntryRequest.java
index a7589730..645af321 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/LookupEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/LookupEntryRequest.java
@@ -703,6 +703,7 @@ public Builder clearTargetName() {
      *
      * @return The linkedResource.
      */
+    @java.lang.Override
     public java.lang.String getLinkedResource() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 1) {
@@ -736,6 +737,7 @@ public java.lang.String getLinkedResource() {
      *
      * @return The bytes for linkedResource.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getLinkedResourceBytes() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 1) {
@@ -852,6 +854,7 @@ public Builder setLinkedResourceBytes(com.google.protobuf.ByteString value) {
      *
      * @return The sqlResource.
      */
+    @java.lang.Override
     public java.lang.String getSqlResource() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 3) {
@@ -887,6 +890,7 @@ public java.lang.String getSqlResource() {
      *
      * @return The bytes for sqlResource.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getSqlResourceBytes() {
       java.lang.Object ref = "";
       if (targetNameCase_ == 3) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTag.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTag.java
index 41678642..32a6288b 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTag.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTag.java
@@ -167,6 +167,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) {
@@ -190,6 +191,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) {
@@ -218,6 +220,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -243,6 +246,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -271,6 +275,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -296,6 +301,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -326,6 +332,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * @return The parentPolicyTag.
    */
+  @java.lang.Override
   public java.lang.String getParentPolicyTag() {
     java.lang.Object ref = parentPolicyTag_;
     if (ref instanceof java.lang.String) {
@@ -353,6 +360,7 @@ public java.lang.String getParentPolicyTag() {
    *
    * @return The bytes for parentPolicyTag.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getParentPolicyTagBytes() {
     java.lang.Object ref = parentPolicyTag_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/RenameTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/RenameTagTemplateFieldRequest.java
index 96cddabf..f74fec1d 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/RenameTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/RenameTagTemplateFieldRequest.java
@@ -136,6 +136,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) {
@@ -161,6 +162,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) {
@@ -186,6 +188,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The newTagTemplateFieldId.
    */
+  @java.lang.Override
   public java.lang.String getNewTagTemplateFieldId() {
     java.lang.Object ref = newTagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
@@ -208,6 +211,7 @@ public java.lang.String getNewTagTemplateFieldId() {
    *
    * @return The bytes for newTagTemplateFieldId.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getNewTagTemplateFieldIdBytes() {
     java.lang.Object ref = newTagTemplateFieldId_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Schema.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Schema.java
index 5b34a5f9..00a74af9 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Schema.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Schema.java
@@ -135,6 +135,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getColumnsList() {
     return columns_;
   }
@@ -150,6 +151,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getColu
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.ColumnSchemaOrBuilder>
       getColumnsOrBuilderList() {
     return columns_;
@@ -166,6 +168,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.ColumnSchema> getColu
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public int getColumnsCount() {
     return columns_.size();
   }
@@ -181,6 +184,7 @@ public int getColumnsCount() {
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ColumnSchema getColumns(int index) {
     return columns_.get(index);
   }
@@ -196,6 +200,7 @@ public com.google.cloud.datacatalog.v1beta1.ColumnSchema getColumns(int index) {
    * repeated .google.cloud.datacatalog.v1beta1.ColumnSchema columns = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.ColumnSchemaOrBuilder getColumnsOrBuilder(int index) {
     return columns_.get(index);
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogRequest.java
index 1aa6e123..eb882ca0 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogRequest.java
@@ -563,6 +563,7 @@ public com.google.protobuf.ByteString getIncludeProjectIdsBytes(int index) {
      *
      * @return The includeGcpPublicDatasets.
      */
+    @java.lang.Override
     public boolean getIncludeGcpPublicDatasets() {
       return includeGcpPublicDatasets_;
     }
@@ -1351,6 +1352,7 @@ public Builder addIncludeProjectIdsBytes(com.google.protobuf.ByteString value) {
        *
        * @return The includeGcpPublicDatasets.
        */
+      @java.lang.Override
       public boolean getIncludeGcpPublicDatasets() {
         return includeGcpPublicDatasets_;
       }
@@ -1469,6 +1471,7 @@ public com.google.protobuf.Parser<Scope> getParserForType() {
    *
    * @return Whether the scope field is set.
    */
+  @java.lang.Override
   public boolean hasScope() {
     return scope_ != null;
   }
@@ -1488,6 +1491,7 @@ public boolean hasScope() {
    *
    * @return The scope.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest.Scope getScope() {
     return scope_ == null
         ? com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest.Scope.getDefaultInstance()
@@ -1507,6 +1511,7 @@ public com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest.Scope getScope(
    * .google.cloud.datacatalog.v1beta1.SearchCatalogRequest.Scope scope = 6 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest.ScopeOrBuilder
       getScopeOrBuilder() {
     return getScope();
@@ -1533,6 +1538,7 @@ public com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest.Scope getScope(
    *
    * @return The query.
    */
+  @java.lang.Override
   public java.lang.String getQuery() {
     java.lang.Object ref = query_;
     if (ref instanceof java.lang.String) {
@@ -1563,6 +1569,7 @@ public java.lang.String getQuery() {
    *
    * @return The bytes for query.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getQueryBytes() {
     java.lang.Object ref = query_;
     if (ref instanceof java.lang.String) {
@@ -1589,6 +1596,7 @@ public com.google.protobuf.ByteString getQueryBytes() {
    *
    * @return The pageSize.
    */
+  @java.lang.Override
   public int getPageSize() {
     return pageSize_;
   }
@@ -1611,6 +1619,7 @@ public int getPageSize() {
    *
    * @return The pageToken.
    */
+  @java.lang.Override
   public java.lang.String getPageToken() {
     java.lang.Object ref = pageToken_;
     if (ref instanceof java.lang.String) {
@@ -1638,6 +1647,7 @@ public java.lang.String getPageToken() {
    *
    * @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) {
@@ -1668,6 +1678,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
    *
    * @return The orderBy.
    */
+  @java.lang.Override
   public java.lang.String getOrderBy() {
     java.lang.Object ref = orderBy_;
     if (ref instanceof java.lang.String) {
@@ -1695,6 +1706,7 @@ public java.lang.String getOrderBy() {
    *
    * @return The bytes for orderBy.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getOrderByBytes() {
     java.lang.Object ref = orderBy_;
     if (ref instanceof java.lang.String) {
@@ -2495,6 +2507,7 @@ public Builder setQueryBytes(com.google.protobuf.ByteString value) {
      *
      * @return The pageSize.
      */
+    @java.lang.Override
     public int getPageSize() {
       return pageSize_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResponse.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResponse.java
index eb339f57..61cf96da 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResponse.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResponse.java
@@ -142,6 +142,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.SearchCatalogResult> getResultsList() {
     return results_;
   }
@@ -154,6 +155,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.SearchCatalogResult>
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.SearchCatalogResultOrBuilder>
       getResultsOrBuilderList() {
     return results_;
@@ -167,6 +169,7 @@ public java.util.List<com.google.cloud.datacatalog.v1beta1.SearchCatalogResult>
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public int getResultsCount() {
     return results_.size();
   }
@@ -179,6 +182,7 @@ public int getResultsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SearchCatalogResult getResults(int index) {
     return results_.get(index);
   }
@@ -191,6 +195,7 @@ public com.google.cloud.datacatalog.v1beta1.SearchCatalogResult getResults(int i
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SearchCatalogResult results = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SearchCatalogResultOrBuilder getResultsOrBuilder(
       int index) {
     return results_.get(index);
@@ -209,6 +214,7 @@ public com.google.cloud.datacatalog.v1beta1.SearchCatalogResultOrBuilder getResu
    *
    * @return The nextPageToken.
    */
+  @java.lang.Override
   public java.lang.String getNextPageToken() {
     java.lang.Object ref = nextPageToken_;
     if (ref instanceof java.lang.String) {
@@ -231,6 +237,7 @@ public java.lang.String getNextPageToken() {
    *
    * @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) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResult.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResult.java
index a66b48d0..9c618ca1 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResult.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchCatalogResult.java
@@ -150,6 +150,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The enum numeric value on the wire for searchResultType.
    */
+  @java.lang.Override
   public int getSearchResultTypeValue() {
     return searchResultType_;
   }
@@ -165,6 +166,7 @@ public int getSearchResultTypeValue() {
    *
    * @return The searchResultType.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SearchResultType getSearchResultType() {
     @SuppressWarnings("deprecation")
     com.google.cloud.datacatalog.v1beta1.SearchResultType result =
@@ -190,6 +192,7 @@ public com.google.cloud.datacatalog.v1beta1.SearchResultType getSearchResultType
    *
    * @return The searchResultSubtype.
    */
+  @java.lang.Override
   public java.lang.String getSearchResultSubtype() {
     java.lang.Object ref = searchResultSubtype_;
     if (ref instanceof java.lang.String) {
@@ -215,6 +218,7 @@ public java.lang.String getSearchResultSubtype() {
    *
    * @return The bytes for searchResultSubtype.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getSearchResultSubtypeBytes() {
     java.lang.Object ref = searchResultSubtype_;
     if (ref instanceof java.lang.String) {
@@ -243,6 +247,7 @@ public com.google.protobuf.ByteString getSearchResultSubtypeBytes() {
    *
    * @return The relativeResourceName.
    */
+  @java.lang.Override
   public java.lang.String getRelativeResourceName() {
     java.lang.Object ref = relativeResourceName_;
     if (ref instanceof java.lang.String) {
@@ -268,6 +273,7 @@ public java.lang.String getRelativeResourceName() {
    *
    * @return The bytes for relativeResourceName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getRelativeResourceNameBytes() {
     java.lang.Object ref = relativeResourceName_;
     if (ref instanceof java.lang.String) {
@@ -296,6 +302,7 @@ public com.google.protobuf.ByteString getRelativeResourceNameBytes() {
    *
    * @return The linkedResource.
    */
+  @java.lang.Override
   public java.lang.String getLinkedResource() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -321,6 +328,7 @@ public java.lang.String getLinkedResource() {
    *
    * @return The bytes for linkedResource.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getLinkedResourceBytes() {
     java.lang.Object ref = linkedResource_;
     if (ref instanceof java.lang.String) {
@@ -717,6 +725,7 @@ public Builder mergeFrom(
      *
      * @return The enum numeric value on the wire for searchResultType.
      */
+    @java.lang.Override
     public int getSearchResultTypeValue() {
       return searchResultType_;
     }
@@ -734,6 +743,7 @@ public int getSearchResultTypeValue() {
      * @return This builder for chaining.
      */
     public Builder setSearchResultTypeValue(int value) {
+
       searchResultType_ = value;
       onChanged();
       return this;
@@ -750,6 +760,7 @@ public Builder setSearchResultTypeValue(int value) {
      *
      * @return The searchResultType.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.SearchResultType getSearchResultType() {
       @SuppressWarnings("deprecation")
       com.google.cloud.datacatalog.v1beta1.SearchResultType result =
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchResultType.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchResultType.java
index 088b4227..54df6524 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchResultType.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SearchResultType.java
@@ -161,6 +161,10 @@ public SearchResultType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedPolicyTag.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedPolicyTag.java
index 799884c6..6d544112 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedPolicyTag.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedPolicyTag.java
@@ -151,6 +151,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -173,6 +174,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -200,6 +202,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -224,6 +227,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -248,6 +252,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag child_policy_tags = 4;
    * </code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag>
       getChildPolicyTagsList() {
     return childPolicyTags_;
@@ -262,6 +267,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag child_policy_tags = 4;
    * </code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.SerializedPolicyTagOrBuilder>
       getChildPolicyTagsOrBuilderList() {
     return childPolicyTags_;
@@ -276,6 +282,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag child_policy_tags = 4;
    * </code>
    */
+  @java.lang.Override
   public int getChildPolicyTagsCount() {
     return childPolicyTags_.size();
   }
@@ -289,6 +296,7 @@ public int getChildPolicyTagsCount() {
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag child_policy_tags = 4;
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag getChildPolicyTags(int index) {
     return childPolicyTags_.get(index);
   }
@@ -302,6 +310,7 @@ public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag getChildPolicyTa
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag child_policy_tags = 4;
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTagOrBuilder
       getChildPolicyTagsOrBuilder(int index) {
     return childPolicyTags_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedTaxonomy.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedTaxonomy.java
index b8ca1550..22665547 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedTaxonomy.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SerializedTaxonomy.java
@@ -152,6 +152,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -174,6 +175,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -201,6 +203,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -225,6 +228,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -248,6 +252,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag policy_tags = 3;</code>
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag>
       getPolicyTagsList() {
     return policyTags_;
@@ -261,6 +266,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag policy_tags = 3;</code>
    */
+  @java.lang.Override
   public java.util.List<? extends com.google.cloud.datacatalog.v1beta1.SerializedPolicyTagOrBuilder>
       getPolicyTagsOrBuilderList() {
     return policyTags_;
@@ -274,6 +280,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag policy_tags = 3;</code>
    */
+  @java.lang.Override
   public int getPolicyTagsCount() {
     return policyTags_.size();
   }
@@ -286,6 +293,7 @@ public int getPolicyTagsCount() {
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag policy_tags = 3;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag getPolicyTags(int index) {
     return policyTags_.get(index);
   }
@@ -298,6 +306,7 @@ public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTag getPolicyTags(in
    *
    * <code>repeated .google.cloud.datacatalog.v1beta1.SerializedPolicyTag policy_tags = 3;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.SerializedPolicyTagOrBuilder getPolicyTagsOrBuilder(
       int index) {
     return policyTags_.get(index);
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SystemTimestamps.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SystemTimestamps.java
index 491c82f5..65ddb48e 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SystemTimestamps.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/SystemTimestamps.java
@@ -160,6 +160,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the createTime field is set.
    */
+  @java.lang.Override
   public boolean hasCreateTime() {
     return createTime_ != null;
   }
@@ -174,6 +175,7 @@ public boolean hasCreateTime() {
    *
    * @return The createTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getCreateTime() {
     return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
   }
@@ -186,6 +188,7 @@ public com.google.protobuf.Timestamp getCreateTime() {
    *
    * <code>.google.protobuf.Timestamp create_time = 1;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
     return getCreateTime();
   }
@@ -203,6 +206,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
    *
    * @return Whether the updateTime field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateTime() {
     return updateTime_ != null;
   }
@@ -217,6 +221,7 @@ public boolean hasUpdateTime() {
    *
    * @return The updateTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getUpdateTime() {
     return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
   }
@@ -229,6 +234,7 @@ public com.google.protobuf.Timestamp getUpdateTime() {
    *
    * <code>.google.protobuf.Timestamp update_time = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
     return getUpdateTime();
   }
@@ -248,6 +254,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
    *
    * @return Whether the expireTime field is set.
    */
+  @java.lang.Override
   public boolean hasExpireTime() {
     return expireTime_ != null;
   }
@@ -264,6 +271,7 @@ public boolean hasExpireTime() {
    *
    * @return The expireTime.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getExpireTime() {
     return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_;
   }
@@ -278,6 +286,7 @@ public com.google.protobuf.Timestamp getExpireTime() {
    * <code>.google.protobuf.Timestamp expire_time = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
    * </code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
     return getExpireTime();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSourceType.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSourceType.java
index 860f8967..de0c53e8 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSourceType.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSourceType.java
@@ -139,6 +139,10 @@ public TableSourceType 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());
   }
 
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSpec.java
index 6bd75a5a..1391ff20 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TableSpec.java
@@ -130,6 +130,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The groupedEntry.
    */
+  @java.lang.Override
   public java.lang.String getGroupedEntry() {
     java.lang.Object ref = groupedEntry_;
     if (ref instanceof java.lang.String) {
@@ -158,6 +159,7 @@ public java.lang.String getGroupedEntry() {
    *
    * @return The bytes for groupedEntry.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getGroupedEntryBytes() {
     java.lang.Object ref = groupedEntry_;
     if (ref instanceof java.lang.String) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Tag.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Tag.java
index 7f006d8f..6965f4fe 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Tag.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Tag.java
@@ -226,6 +226,7 @@ public ScopeCase getScopeCase() {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -251,6 +252,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) {
@@ -278,6 +280,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The template.
    */
+  @java.lang.Override
   public java.lang.String getTemplate() {
     java.lang.Object ref = template_;
     if (ref instanceof java.lang.String) {
@@ -302,6 +305,7 @@ public java.lang.String getTemplate() {
    *
    * @return The bytes for template.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTemplateBytes() {
     java.lang.Object ref = template_;
     if (ref instanceof java.lang.String) {
@@ -327,6 +331,7 @@ public com.google.protobuf.ByteString getTemplateBytes() {
    *
    * @return The templateDisplayName.
    */
+  @java.lang.Override
   public java.lang.String getTemplateDisplayName() {
     java.lang.Object ref = templateDisplayName_;
     if (ref instanceof java.lang.String) {
@@ -349,6 +354,7 @@ public java.lang.String getTemplateDisplayName() {
    *
    * @return The bytes for templateDisplayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getTemplateDisplayNameBytes() {
     java.lang.Object ref = templateDisplayName_;
     if (ref instanceof java.lang.String) {
@@ -471,6 +477,7 @@ public int getFieldsCount() {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public boolean containsFields(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -478,6 +485,7 @@ public boolean containsFields(java.lang.String key) {
     return internalGetFields().getMap().containsKey(key);
   }
   /** Use {@link #getFieldsMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagField>
       getFields() {
@@ -496,6 +504,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagField>
       getFieldsMap() {
     return internalGetFields().getMap();
@@ -513,6 +522,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrDefault(
       java.lang.String key, com.google.cloud.datacatalog.v1beta1.TagField defaultValue) {
     if (key == null) {
@@ -535,6 +545,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrDefault(
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrThrow(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -1356,6 +1367,7 @@ public Builder setTemplateDisplayNameBytes(com.google.protobuf.ByteString value)
      *
      * @return The column.
      */
+    @java.lang.Override
     public java.lang.String getColumn() {
       java.lang.Object ref = "";
       if (scopeCase_ == 4) {
@@ -1387,6 +1399,7 @@ public java.lang.String getColumn() {
      *
      * @return The bytes for column.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getColumnBytes() {
       java.lang.Object ref = "";
       if (scopeCase_ == 4) {
@@ -1521,6 +1534,7 @@ public int getFieldsCount() {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public boolean containsFields(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -1528,6 +1542,7 @@ public boolean containsFields(java.lang.String key) {
       return internalGetFields().getMap().containsKey(key);
     }
     /** Use {@link #getFieldsMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagField>
         getFields() {
@@ -1546,6 +1561,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagField>
         getFieldsMap() {
       return internalGetFields().getMap();
@@ -1563,6 +1579,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrDefault(
         java.lang.String key, com.google.cloud.datacatalog.v1beta1.TagField defaultValue) {
       if (key == null) {
@@ -1585,6 +1602,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrDefault(
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagField getFieldsOrThrow(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagField.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagField.java
index 8e0786d9..e4672e1b 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagField.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagField.java
@@ -305,6 +305,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
      *
      * @return The displayName.
      */
+    @java.lang.Override
     public java.lang.String getDisplayName() {
       java.lang.Object ref = displayName_;
       if (ref instanceof java.lang.String) {
@@ -327,6 +328,7 @@ public java.lang.String getDisplayName() {
      *
      * @return The bytes for displayName.
      */
+    @java.lang.Override
     public com.google.protobuf.ByteString getDisplayNameBytes() {
       java.lang.Object ref = displayName_;
       if (ref instanceof java.lang.String) {
@@ -889,6 +891,7 @@ public KindCase getKindCase() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -911,6 +914,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -935,6 +939,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The doubleValue.
    */
+  @java.lang.Override
   public double getDoubleValue() {
     if (kindCase_ == 2) {
       return (java.lang.Double) kind_;
@@ -1010,6 +1015,7 @@ public com.google.protobuf.ByteString getStringValueBytes() {
    *
    * @return The boolValue.
    */
+  @java.lang.Override
   public boolean getBoolValue() {
     if (kindCase_ == 4) {
       return (java.lang.Boolean) kind_;
@@ -1029,6 +1035,7 @@ public boolean getBoolValue() {
    *
    * @return Whether the timestampValue field is set.
    */
+  @java.lang.Override
   public boolean hasTimestampValue() {
     return kindCase_ == 5;
   }
@@ -1043,6 +1050,7 @@ public boolean hasTimestampValue() {
    *
    * @return The timestampValue.
    */
+  @java.lang.Override
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (kindCase_ == 5) {
       return (com.google.protobuf.Timestamp) kind_;
@@ -1058,6 +1066,7 @@ public com.google.protobuf.Timestamp getTimestampValue() {
    *
    * <code>.google.protobuf.Timestamp timestamp_value = 5;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     if (kindCase_ == 5) {
       return (com.google.protobuf.Timestamp) kind_;
@@ -1078,6 +1087,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
    *
    * @return Whether the enumValue field is set.
    */
+  @java.lang.Override
   public boolean hasEnumValue() {
     return kindCase_ == 6;
   }
@@ -1093,6 +1103,7 @@ public boolean hasEnumValue() {
    *
    * @return The enumValue.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagField.EnumValue getEnumValue() {
     if (kindCase_ == 6) {
       return (com.google.cloud.datacatalog.v1beta1.TagField.EnumValue) kind_;
@@ -1109,6 +1120,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField.EnumValue getEnumValue() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.TagField.EnumValue enum_value = 6;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagField.EnumValueOrBuilder getEnumValueOrBuilder() {
     if (kindCase_ == 6) {
       return (com.google.cloud.datacatalog.v1beta1.TagField.EnumValue) kind_;
@@ -1133,6 +1145,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField.EnumValueOrBuilder getEnumV
    *
    * @return The order.
    */
+  @java.lang.Override
   public int getOrder() {
     return order_;
   }
@@ -1800,6 +1813,7 @@ public Builder clearDoubleValue() {
      *
      * @return The stringValue.
      */
+    @java.lang.Override
     public java.lang.String getStringValue() {
       java.lang.Object ref = "";
       if (kindCase_ == 3) {
@@ -1827,6 +1841,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 (kindCase_ == 3) {
@@ -1977,6 +1992,7 @@ public Builder clearBoolValue() {
      *
      * @return Whether the timestampValue field is set.
      */
+    @java.lang.Override
     public boolean hasTimestampValue() {
       return kindCase_ == 5;
     }
@@ -1991,6 +2007,7 @@ public boolean hasTimestampValue() {
      *
      * @return The timestampValue.
      */
+    @java.lang.Override
     public com.google.protobuf.Timestamp getTimestampValue() {
       if (timestampValueBuilder_ == null) {
         if (kindCase_ == 5) {
@@ -2120,6 +2137,7 @@ public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
      *
      * <code>.google.protobuf.Timestamp timestamp_value = 5;</code>
      */
+    @java.lang.Override
     public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       if ((kindCase_ == 5) && (timestampValueBuilder_ != null)) {
         return timestampValueBuilder_.getMessageOrBuilder();
@@ -2179,6 +2197,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      *
      * @return Whether the enumValue field is set.
      */
+    @java.lang.Override
     public boolean hasEnumValue() {
       return kindCase_ == 6;
     }
@@ -2194,6 +2213,7 @@ public boolean hasEnumValue() {
      *
      * @return The enumValue.
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagField.EnumValue getEnumValue() {
       if (enumValueBuilder_ == null) {
         if (kindCase_ == 6) {
@@ -2333,6 +2353,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField.EnumValue.Builder getEnumVa
      *
      * <code>.google.cloud.datacatalog.v1beta1.TagField.EnumValue enum_value = 6;</code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagField.EnumValueOrBuilder
         getEnumValueOrBuilder() {
       if ((kindCase_ == 6) && (enumValueBuilder_ != null)) {
@@ -2395,6 +2416,7 @@ public com.google.cloud.datacatalog.v1beta1.TagField.EnumValue.Builder getEnumVa
      *
      * @return The order.
      */
+    @java.lang.Override
     public int getOrder() {
       return order_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplate.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplate.java
index 83be1b9f..58597871 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplate.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplate.java
@@ -170,6 +170,7 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -195,6 +196,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) {
@@ -220,6 +222,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -242,6 +245,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -304,6 +308,7 @@ public int getFieldsCount() {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public boolean containsFields(java.lang.String key) {
     if (key == null) {
       throw new java.lang.NullPointerException();
@@ -311,6 +316,7 @@ public boolean containsFields(java.lang.String key) {
     return internalGetFields().getMap().containsKey(key);
   }
   /** Use {@link #getFieldsMap()} instead. */
+  @java.lang.Override
   @java.lang.Deprecated
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagTemplateField>
       getFields() {
@@ -333,6 +339,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagTemplateField>
       getFieldsMap() {
     return internalGetFields().getMap();
@@ -354,6 +361,7 @@ public boolean containsFields(java.lang.String key) {
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrDefault(
       java.lang.String key, com.google.cloud.datacatalog.v1beta1.TagTemplateField defaultValue) {
     if (key == null) {
@@ -380,6 +388,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrDefault(
    * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrThrow(
       java.lang.String key) {
     if (key == null) {
@@ -1054,6 +1063,7 @@ public int getFieldsCount() {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public boolean containsFields(java.lang.String key) {
       if (key == null) {
         throw new java.lang.NullPointerException();
@@ -1061,6 +1071,7 @@ public boolean containsFields(java.lang.String key) {
       return internalGetFields().getMap().containsKey(key);
     }
     /** Use {@link #getFieldsMap()} instead. */
+    @java.lang.Override
     @java.lang.Deprecated
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagTemplateField>
         getFields() {
@@ -1083,6 +1094,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public java.util.Map<java.lang.String, com.google.cloud.datacatalog.v1beta1.TagTemplateField>
         getFieldsMap() {
       return internalGetFields().getMap();
@@ -1104,6 +1116,7 @@ public boolean containsFields(java.lang.String key) {
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrDefault(
         java.lang.String key, com.google.cloud.datacatalog.v1beta1.TagTemplateField defaultValue) {
       if (key == null) {
@@ -1130,6 +1143,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrDefault(
      * map&lt;string, .google.cloud.datacatalog.v1beta1.TagTemplateField&gt; fields = 3 [(.google.api.field_behavior) = REQUIRED];
      * </code>
      */
+    @java.lang.Override
     public com.google.cloud.datacatalog.v1beta1.TagTemplateField getFieldsOrThrow(
         java.lang.String key) {
       if (key == null) {
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateField.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateField.java
index e970c293..632827ea 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateField.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/TagTemplateField.java
@@ -161,6 +161,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) {
@@ -186,6 +187,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) {
@@ -211,6 +213,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -233,6 +236,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -260,6 +264,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return Whether the type field is set.
    */
+  @java.lang.Override
   public boolean hasType() {
     return type_ != null;
   }
@@ -276,6 +281,7 @@ public boolean hasType() {
    *
    * @return The type.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.FieldType getType() {
     return type_ == null
         ? com.google.cloud.datacatalog.v1beta1.FieldType.getDefaultInstance()
@@ -292,6 +298,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldType getType() {
    * .google.cloud.datacatalog.v1beta1.FieldType type = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.FieldTypeOrBuilder getTypeOrBuilder() {
     return getType();
   }
@@ -309,6 +316,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldTypeOrBuilder getTypeOrBuilder(
    *
    * @return The isRequired.
    */
+  @java.lang.Override
   public boolean getIsRequired() {
     return isRequired_;
   }
@@ -329,6 +337,7 @@ public boolean getIsRequired() {
    *
    * @return The order.
    */
+  @java.lang.Override
   public int getOrder() {
     return order_;
   }
@@ -1168,6 +1177,7 @@ public com.google.cloud.datacatalog.v1beta1.FieldTypeOrBuilder getTypeOrBuilder(
      *
      * @return The isRequired.
      */
+    @java.lang.Override
     public boolean getIsRequired() {
       return isRequired_;
     }
@@ -1222,6 +1232,7 @@ public Builder clearIsRequired() {
      *
      * @return The order.
      */
+    @java.lang.Override
     public int getOrder() {
       return order_;
     }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Taxonomy.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Taxonomy.java
index d5bceb1a..015e636f 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Taxonomy.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/Taxonomy.java
@@ -262,6 +262,10 @@ public PolicyType 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());
     }
 
@@ -308,6 +312,7 @@ private PolicyType(int value) {
    *
    * @return The name.
    */
+  @java.lang.Override
   public java.lang.String getName() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
@@ -331,6 +336,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) {
@@ -358,6 +364,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return The displayName.
    */
+  @java.lang.Override
   public java.lang.String getDisplayName() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -382,6 +389,7 @@ public java.lang.String getDisplayName() {
    *
    * @return The bytes for displayName.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDisplayNameBytes() {
     java.lang.Object ref = displayName_;
     if (ref instanceof java.lang.String) {
@@ -409,6 +417,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() {
    *
    * @return The description.
    */
+  @java.lang.Override
   public java.lang.String getDescription() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -433,6 +442,7 @@ public java.lang.String getDescription() {
    *
    * @return The bytes for description.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getDescriptionBytes() {
     java.lang.Object ref = description_;
     if (ref instanceof java.lang.String) {
@@ -476,6 +486,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy.PolicyType convert(
    *
    * @return A list containing the activatedPolicyTypes.
    */
+  @java.lang.Override
   public java.util.List<com.google.cloud.datacatalog.v1beta1.Taxonomy.PolicyType>
       getActivatedPolicyTypesList() {
     return new com.google.protobuf.Internal.ListAdapter<
@@ -496,6 +507,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy.PolicyType convert(
    *
    * @return The count of activatedPolicyTypes.
    */
+  @java.lang.Override
   public int getActivatedPolicyTypesCount() {
     return activatedPolicyTypes_.size();
   }
@@ -514,6 +526,7 @@ public int getActivatedPolicyTypesCount() {
    * @param index The index of the element to return.
    * @return The activatedPolicyTypes at the given index.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Taxonomy.PolicyType getActivatedPolicyTypes(
       int index) {
     return activatedPolicyTypes_converter_.convert(activatedPolicyTypes_.get(index));
@@ -532,6 +545,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy.PolicyType getActivatedPoli
    *
    * @return A list containing the enum numeric values on the wire for activatedPolicyTypes.
    */
+  @java.lang.Override
   public java.util.List<java.lang.Integer> getActivatedPolicyTypesValueList() {
     return activatedPolicyTypes_;
   }
@@ -550,6 +564,7 @@ public java.util.List<java.lang.Integer> getActivatedPolicyTypesValueList() {
    * @param index The index of the value to return.
    * @return The enum numeric value on the wire of activatedPolicyTypes at the given index.
    */
+  @java.lang.Override
   public int getActivatedPolicyTypesValue(int index) {
     return activatedPolicyTypes_.get(index);
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryGroupRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryGroupRequest.java
index 916713c3..0196d6be 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryGroupRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryGroupRequest.java
@@ -149,6 +149,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the entryGroup field is set.
    */
+  @java.lang.Override
   public boolean hasEntryGroup() {
     return entryGroup_ != null;
   }
@@ -165,6 +166,7 @@ public boolean hasEntryGroup() {
    *
    * @return The entryGroup.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroup() {
     return entryGroup_ == null
         ? com.google.cloud.datacatalog.v1beta1.EntryGroup.getDefaultInstance()
@@ -181,6 +183,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryGroup getEntryGroup() {
    * .google.cloud.datacatalog.v1beta1.EntryGroup entry_group = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder getEntryGroupOrBuilder() {
     return getEntryGroup();
   }
@@ -199,6 +202,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryGroupOrBuilder getEntryGroupOrB
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -214,6 +218,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -227,6 +232,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryRequest.java
index be7e6f90..c6836960 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateEntryRequest.java
@@ -149,6 +149,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the entry field is set.
    */
+  @java.lang.Override
   public boolean hasEntry() {
     return entry_ != null;
   }
@@ -165,6 +166,7 @@ public boolean hasEntry() {
    *
    * @return The entry.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Entry getEntry() {
     return entry_ == null
         ? com.google.cloud.datacatalog.v1beta1.Entry.getDefaultInstance()
@@ -181,6 +183,7 @@ public com.google.cloud.datacatalog.v1beta1.Entry getEntry() {
    * .google.cloud.datacatalog.v1beta1.Entry entry = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.EntryOrBuilder getEntryOrBuilder() {
     return getEntry();
   }
@@ -216,6 +219,7 @@ public com.google.cloud.datacatalog.v1beta1.EntryOrBuilder getEntryOrBuilder() {
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -248,6 +252,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -278,6 +283,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdatePolicyTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdatePolicyTagRequest.java
index 1295cd4e..28c36ef8 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdatePolicyTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdatePolicyTagRequest.java
@@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the policyTag field is set.
    */
+  @java.lang.Override
   public boolean hasPolicyTag() {
     return policyTag_ != null;
   }
@@ -163,6 +164,7 @@ public boolean hasPolicyTag() {
    *
    * @return The policyTag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTag() {
     return policyTag_ == null
         ? com.google.cloud.datacatalog.v1beta1.PolicyTag.getDefaultInstance()
@@ -178,6 +180,7 @@ public com.google.cloud.datacatalog.v1beta1.PolicyTag getPolicyTag() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.PolicyTag policy_tag = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder getPolicyTagOrBuilder() {
     return getPolicyTag();
   }
@@ -201,6 +204,7 @@ public com.google.cloud.datacatalog.v1beta1.PolicyTagOrBuilder getPolicyTagOrBui
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -221,6 +225,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -239,6 +244,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagRequest.java
index 7303bd75..f8c64141 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagRequest.java
@@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the tag field is set.
    */
+  @java.lang.Override
   public boolean hasTag() {
     return tag_ != null;
   }
@@ -163,6 +164,7 @@ public boolean hasTag() {
    *
    * @return The tag.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Tag getTag() {
     return tag_ == null ? com.google.cloud.datacatalog.v1beta1.Tag.getDefaultInstance() : tag_;
   }
@@ -176,6 +178,7 @@ public com.google.cloud.datacatalog.v1beta1.Tag getTag() {
    * <code>.google.cloud.datacatalog.v1beta1.Tag tag = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagOrBuilder getTagOrBuilder() {
     return getTag();
   }
@@ -194,6 +197,7 @@ public com.google.cloud.datacatalog.v1beta1.TagOrBuilder getTagOrBuilder() {
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -209,6 +213,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -222,6 +227,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateFieldRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateFieldRequest.java
index e74e5f14..ec19ca6d 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateFieldRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateFieldRequest.java
@@ -160,6 +160,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) {
@@ -185,6 +186,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) {
@@ -212,6 +214,7 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    * @return Whether the tagTemplateField field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplateField() {
     return tagTemplateField_ != null;
   }
@@ -228,6 +231,7 @@ public boolean hasTagTemplateField() {
    *
    * @return The tagTemplateField.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateField getTagTemplateField() {
     return tagTemplateField_ == null
         ? com.google.cloud.datacatalog.v1beta1.TagTemplateField.getDefaultInstance()
@@ -244,6 +248,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateField getTagTemplateField
    * .google.cloud.datacatalog.v1beta1.TagTemplateField tag_template_field = 2 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateFieldOrBuilder
       getTagTemplateFieldOrBuilder() {
     return getTagTemplateField();
@@ -273,6 +278,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateField getTagTemplateField
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -298,6 +304,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -321,6 +328,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    * <code>.google.protobuf.FieldMask update_mask = 3 [(.google.api.field_behavior) = OPTIONAL];
    * </code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateRequest.java
index b3010266..4c7c2e48 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTagTemplateRequest.java
@@ -149,6 +149,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the tagTemplate field is set.
    */
+  @java.lang.Override
   public boolean hasTagTemplate() {
     return tagTemplate_ != null;
   }
@@ -165,6 +166,7 @@ public boolean hasTagTemplate() {
    *
    * @return The tagTemplate.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplate getTagTemplate() {
     return tagTemplate_ == null
         ? com.google.cloud.datacatalog.v1beta1.TagTemplate.getDefaultInstance()
@@ -181,6 +183,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplate getTagTemplate() {
    * .google.cloud.datacatalog.v1beta1.TagTemplate tag_template = 1 [(.google.api.field_behavior) = REQUIRED];
    * </code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TagTemplateOrBuilder getTagTemplateOrBuilder() {
     return getTagTemplate();
   }
@@ -201,6 +204,7 @@ public com.google.cloud.datacatalog.v1beta1.TagTemplateOrBuilder getTagTemplateO
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -218,6 +222,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -233,6 +238,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTaxonomyRequest.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTaxonomyRequest.java
index 29454d00..cc5d69ca 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTaxonomyRequest.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/UpdateTaxonomyRequest.java
@@ -148,6 +148,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return Whether the taxonomy field is set.
    */
+  @java.lang.Override
   public boolean hasTaxonomy() {
     return taxonomy_ != null;
   }
@@ -163,6 +164,7 @@ public boolean hasTaxonomy() {
    *
    * @return The taxonomy.
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomy() {
     return taxonomy_ == null
         ? com.google.cloud.datacatalog.v1beta1.Taxonomy.getDefaultInstance()
@@ -178,6 +180,7 @@ public com.google.cloud.datacatalog.v1beta1.Taxonomy getTaxonomy() {
    *
    * <code>.google.cloud.datacatalog.v1beta1.Taxonomy taxonomy = 1;</code>
    */
+  @java.lang.Override
   public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomyOrBuilder() {
     return getTaxonomy();
   }
@@ -198,6 +201,7 @@ public com.google.cloud.datacatalog.v1beta1.TaxonomyOrBuilder getTaxonomyOrBuild
    *
    * @return Whether the updateMask field is set.
    */
+  @java.lang.Override
   public boolean hasUpdateMask() {
     return updateMask_ != null;
   }
@@ -215,6 +219,7 @@ public boolean hasUpdateMask() {
    *
    * @return The updateMask.
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMask getUpdateMask() {
     return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
   }
@@ -230,6 +235,7 @@ public com.google.protobuf.FieldMask getUpdateMask() {
    *
    * <code>.google.protobuf.FieldMask update_mask = 2;</code>
    */
+  @java.lang.Override
   public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
     return getUpdateMask();
   }
diff --git a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ViewSpec.java b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ViewSpec.java
index cf8070be..84162e68 100644
--- a/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ViewSpec.java
+++ b/proto-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/ViewSpec.java
@@ -124,6 +124,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * @return The viewQuery.
    */
+  @java.lang.Override
   public java.lang.String getViewQuery() {
     java.lang.Object ref = viewQuery_;
     if (ref instanceof java.lang.String) {
@@ -146,6 +147,7 @@ public java.lang.String getViewQuery() {
    *
    * @return The bytes for viewQuery.
    */
+  @java.lang.Override
   public com.google.protobuf.ByteString getViewQueryBytes() {
     java.lang.Object ref = viewQuery_;
     if (ref instanceof java.lang.String) {
diff --git a/synth.metadata b/synth.metadata
index 5cae7713..d6ffee3d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,23 +11,23 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "684dfea7decfeca7a7526ea96a8e9256694dd5d8",
-        "internalRef": "310415142"
+        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
+        "internalRef": "313460921"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "684dfea7decfeca7a7526ea96a8e9256694dd5d8",
-        "internalRef": "310415142"
+        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
+        "internalRef": "313460921"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7b7f386b393947a542b87707499f4458136f4f61"
+        "sha": "470789cee75ce93c41348ad6aa4c49363a80399b"
       }
     }
   ],

From 251ef45318f0d011a00b7d0f586d947b397b5694 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 3 Jun 2020 17:13:37 -0700
Subject: [PATCH 4/5] chore(java_templates): add default CODEOWNERS files for
 samples reviews

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 <chingor@google.com>
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     | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..6137bef2
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +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 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 d6ffee3d..82ab9751 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,23 +11,23 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "f72c3a53fe6705cd705b4fc4e464bed4dbd1f18f",
+        "internalRef": "314606371"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "f72c3a53fe6705cd705b4fc4e464bed4dbd1f18f",
+        "internalRef": "314606371"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "470789cee75ce93c41348ad6aa4c49363a80399b"
+        "sha": "8b65daa222d193b689279162781baf0aa1f0ffd2"
       }
     }
   ],

From d36205a23f750d35a5246441d86b8d70f53686d0 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Thu, 4 Jun 2020 15:51:55 -0700
Subject: [PATCH 5/5] chore: allow breaking changes

---
 .../clirr-ignored-differences.xml             | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 google-cloud-datacatalog/clirr-ignored-differences.xml

diff --git a/google-cloud-datacatalog/clirr-ignored-differences.xml b/google-cloud-datacatalog/clirr-ignored-differences.xml
new file mode 100644
index 00000000..cd35bde3
--- /dev/null
+++ b/google-cloud-datacatalog/clirr-ignored-differences.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogClient</className>
+    <method>java.lang.String format*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogClient</className>
+    <method>java.lang.String parse*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogClient</className>
+    <method>* testIamPermissions(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogClient</className>
+    <method>com.google.cloud.datacatalog.v1beta1.List*Response list*(*)</method>
+    <to>com.google.cloud.datacatalog.v1beta1.DataCatalogClient$List*PagedResponse</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogSettings*</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings* list*Settings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/stub/DataCatalogStubSettings*</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings* list*Settings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient</className>
+    <method>com.google.cloud.datacatalog.v1beta1.List*Response list*(*)</method>
+    <to>com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClient$List*PagedResponse</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings*</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings* list*Settings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerStubSettings*</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings* list*Settings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
+  </difference>
+  <difference>
+    <differenceType>7004</differenceType>
+    <className>com/google/cloud/datacatalog/v1beta1/DataCatalogClient</className>
+    <method>com.google.cloud.datacatalog.v1beta1.DataCatalogClient$SearchCatalogPagedResponse searchCatalog(com.google.cloud.datacatalog.v1beta1.SearchCatalogRequest$Scope, java.lang.String, java.lang.String)</method>
+  </difference>
+</differences>
\ No newline at end of file