From b56b2fb43d8c27d8c7bbf495c928587d5b27e554 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 25 Jun 2020 23:43:19 -0700 Subject: [PATCH] fix: migrate to grpc_service_config (#238) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/ab32bcf0-0b80-4de6-8e9a-805e404915b2/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 318312024 Source-Link: https://github.com/googleapis/googleapis/commit/8f57b478971817195a74d47632dd13a1c409f012 PiperOrigin-RevId: 318311657 Source-Link: https://github.com/googleapis/googleapis/commit/ed796a1d5787046c24261dd059874721f93c2b7a --- README.md | 4 +- .../v1/stub/DataCatalogStubSettings.java | 136 +- .../v1beta1/DataCatalogClient.java | 1418 ++++++++--------- .../v1beta1/DataCatalogSettings.java | 128 +- .../datacatalog/v1beta1/package-info.java | 4 +- .../v1beta1/stub/DataCatalogStub.java | 48 +- .../v1beta1/stub/DataCatalogStubSettings.java | 400 ++--- .../v1beta1/stub/GrpcDataCatalogStub.java | 358 ++--- ...cyTagManagerSerializationStubSettings.java | 32 +- .../stub/PolicyTagManagerStubSettings.java | 76 +- .../v1beta1/DataCatalogClientTest.java | 468 +++--- synth.metadata | 10 +- 12 files changed, 1564 insertions(+), 1518 deletions(-) diff --git a/README.md b/README.md index 0967514c..9c6e86c7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 7.0.0 + 7.0.1 pom import @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datacatalog - 0.36.0 + 1.0.0 ``` diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/DataCatalogStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/DataCatalogStubSettings.java index ad2afb6c..c4918e53 100644 --- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/DataCatalogStubSettings.java +++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/DataCatalogStubSettings.java @@ -686,11 +686,11 @@ public static class Builder extends StubSettings.Builder> definitions = ImmutableMap.builder(); definitions.put( - "idempotent", - ImmutableSet.copyOf( - Lists.newArrayList( - StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); - definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); + "retry_policy_1_codes", + ImmutableSet.copyOf(Lists.newArrayList(StatusCode.Code.UNAVAILABLE))); + definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList())); + definitions.put( + "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList())); RETRYABLE_CODE_DEFINITIONS = definitions.build(); } @@ -704,12 +704,22 @@ public static class Builder extends StubSettings.Builder * * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) { - * EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]"); - * dataCatalogClient.deleteEntryGroup(name); + * EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]"); + * Entry response = dataCatalogClient.getEntry(name); * } * * @@ -331,216 +331,6 @@ public final UnaryCallable searchCa return stub.searchCatalogCallable(); } - // 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   dataCatalogClient.deleteEntryGroup(name);
-   * }
-   *
- * - * @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 void deleteEntryGroup(EntryGroupName name) { - DeleteEntryGroupRequest request = - DeleteEntryGroupRequest.newBuilder().setName(name == null ? null : name.toString()).build(); - deleteEntryGroup(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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   dataCatalogClient.deleteEntryGroup(name.toString());
-   * }
-   *
- * - * @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 void deleteEntryGroup(String name) { - DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder().setName(name).build(); - deleteEntryGroup(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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   dataCatalogClient.deleteEntryGroup(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final void deleteEntryGroup(DeleteEntryGroupRequest request) { - deleteEntryGroupCallable().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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
-   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture<Void> future = dataCatalogClient.deleteEntryGroupCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteEntryGroupCallable() { - return stub.deleteEntryGroupCallable(); - } - - // 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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   dataCatalogClient.deleteEntry(name);
-   * }
-   *
- * - * @param name Required. The name of the entry. Example: - *

* - * 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 void deleteEntry(EntryName name) { - DeleteEntryRequest request = - DeleteEntryRequest.newBuilder().setName(name == null ? null : name.toString()).build(); - deleteEntry(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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   dataCatalogClient.deleteEntry(name.toString());
-   * }
-   *
- * - * @param name Required. The name of the entry. Example: - *

* - * 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 void deleteEntry(String name) { - DeleteEntryRequest request = DeleteEntryRequest.newBuilder().setName(name).build(); - deleteEntry(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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   dataCatalogClient.deleteEntry(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final void deleteEntry(DeleteEntryRequest request) { - deleteEntryCallable().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] - * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture<Void> future = dataCatalogClient.deleteEntryCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteEntryCallable() { - return stub.deleteEntryCallable(); - } - // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Gets an entry. @@ -630,507 +420,48 @@ public final Entry getEntry(GetEntryRequest request) { * */ public final UnaryCallable getEntryCallable() { - return stub.getEntryCallable(); - } - - // 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. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
-   *   Entry response = dataCatalogClient.lookupEntry(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final Entry lookupEntry(LookupEntryRequest request) { - return lookupEntryCallable().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. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
-   *   ApiFuture<Entry> future = dataCatalogClient.lookupEntryCallable().futureCall(request);
-   *   // Do something
-   *   Entry response = future.get();
-   * }
-   *
- */ - public final UnaryCallable lookupEntryCallable() { - return stub.lookupEntryCallable(); - } - - // 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplate(name, force);
-   * }
-   *
- * - * @param name Required. The name of the tag template to delete. Example: - *

* 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(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 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplate(name.toString(), force);
-   * }
-   *
- * - * @param name Required. The name of the tag template to delete. Example: - *

* 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) { - 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .setForce(force)
-   *     .build();
-   *   dataCatalogClient.deleteTagTemplate(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-   *   boolean force = false;
-   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .setForce(force)
-   *     .build();
-   *   ApiFuture<Void> future = dataCatalogClient.deleteTagTemplateCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteTagTemplateCallable() { - return stub.deleteTagTemplateCallable(); - } - - // 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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplateField(name, force);
-   * }
-   *
- * - * @param name Required. The name of the tag template field to delete. Example: - *

* - * 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(TagTemplateFieldName name, boolean force) { - DeleteTagTemplateFieldRequest request = - DeleteTagTemplateFieldRequest.newBuilder() - .setName(name == null ? null : name.toString()) - .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). - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   boolean force = false;
-   *   dataCatalogClient.deleteTagTemplateField(name.toString(), force);
-   * }
-   *
- * - * @param name Required. The name of the tag template field to delete. Example: - *

* - * 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). - * - *

Sample 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();
-   *   dataCatalogClient.deleteTagTemplateField(request);
-   * }
-   *
- * - * @param request The request object containing all of the parameters for the API call. - * @throws com.google.api.gax.rpc.ApiException if the remote call fails - */ - public final 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). - * - *

Sample 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();
-   *   ApiFuture<Void> future = dataCatalogClient.deleteTagTemplateFieldCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   *
- */ - public final UnaryCallable - deleteTagTemplateFieldCallable() { - return stub.deleteTagTemplateFieldCallable(); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a tag. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   dataCatalogClient.deleteTag(name);
-   * }
-   *
- * - * @param name Required. The name of the tag to delete. Example: - *

* - * 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. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   dataCatalogClient.deleteTag(name.toString());
-   * }
-   *
- * - * @param name Required. The name of the tag to delete. Example: - *

* - * 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. - * - *

Sample 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);
-   * }
-   *
- * - * @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); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD - /** - * Deletes a tag. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture<Void> future = dataCatalogClient.deleteTagCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   *
- */ - public final UnaryCallable deleteTagCallable() { - return stub.deleteTagCallable(); - } - - // 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. - * - *

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. - * - *

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. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   Policy response = dataCatalogClient.getIamPolicy(resource);
-   * }
-   *
- * - * @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. - * - *

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. - * - *

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. - * - *

Sample code: - * - * 


-   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   Policy response = dataCatalogClient.getIamPolicy(resource.toString());
-   * }
-   *
- * - * @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); + return stub.getEntryCallable(); } // 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. - * - *

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. - * - *

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. + * 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. * *

Sample code: * * 


    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
-   *     .setResource(resource.toString())
-   *     .build();
-   *   Policy response = dataCatalogClient.getIamPolicy(request);
+   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+   *   Entry response = dataCatalogClient.lookupEntry(request);
    * }
    *
* * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final Policy getIamPolicy(GetIamPolicyRequest request) { - return getIamPolicyCallable().call(request); + public final Entry lookupEntry(LookupEntryRequest request) { + return lookupEntryCallable().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. - * - *

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. - * - *

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. + * 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. * *

Sample code: * * 


    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
-   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
-   *     .setResource(resource.toString())
-   *     .build();
-   *   ApiFuture<Policy> future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
+   *   LookupEntryRequest request = LookupEntryRequest.newBuilder().build();
+   *   ApiFuture<Entry> future = dataCatalogClient.lookupEntryCallable().futureCall(request);
    *   // Do something
-   *   Policy response = future.get();
+   *   Entry response = future.get();
    * }
    *
*/ - public final UnaryCallable getIamPolicyCallable() { - return stub.getIamPolicyCallable(); + public final UnaryCallable lookupEntryCallable() { + return stub.lookupEntryCallable(); } // AUTO-GENERATED DOCUMENTATION AND METHOD @@ -1516,6 +847,108 @@ public final UnaryCallable getEntryGroupCallab return stub.getEntryGroupCallable(); } + // 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   dataCatalogClient.deleteEntryGroup(name);
+   * }
+   *
+ * + * @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 void deleteEntryGroup(EntryGroupName name) { + DeleteEntryGroupRequest request = + DeleteEntryGroupRequest.newBuilder().setName(name == null ? null : name.toString()).build(); + deleteEntryGroup(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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   dataCatalogClient.deleteEntryGroup(name.toString());
+   * }
+   *
+ * + * @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 void deleteEntryGroup(String name) { + DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder().setName(name).build(); + deleteEntryGroup(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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   dataCatalogClient.deleteEntryGroup(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final void deleteEntryGroup(DeleteEntryGroupRequest request) { + deleteEntryGroupCallable().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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   DeleteEntryGroupRequest request = DeleteEntryGroupRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Void> future = dataCatalogClient.deleteEntryGroupCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteEntryGroupCallable() { + return stub.deleteEntryGroupCallable(); + } + // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Lists entry groups. @@ -1877,26 +1310,134 @@ public final Entry updateEntry(UpdateEntryRequest 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] + * 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   Entry entry = Entry.newBuilder().build();
+   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
+   *     .setEntry(entry)
+   *     .build();
+   *   ApiFuture<Entry> future = dataCatalogClient.updateEntryCallable().futureCall(request);
+   *   // Do something
+   *   Entry response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable updateEntryCallable() { + return stub.updateEntryCallable(); + } + + // 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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteEntry(name);
+   * }
+   *
+ * + * @param name Required. The name of the entry. Example: + *

* + * 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 void deleteEntry(EntryName name) { + DeleteEntryRequest request = + DeleteEntryRequest.newBuilder().setName(name == null ? null : name.toString()).build(); + deleteEntry(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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteEntry(name.toString());
+   * }
+   *
+ * + * @param name Required. The name of the entry. Example: + *

* + * 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 void deleteEntry(String name) { + DeleteEntryRequest request = DeleteEntryRequest.newBuilder().setName(name).build(); + deleteEntry(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] + * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   dataCatalogClient.deleteEntry(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final void deleteEntry(DeleteEntryRequest request) { + deleteEntryCallable().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] * (https://cloud.google.com/data-catalog/docs/concepts/resource-project) for more information). * *

Sample code: * * 


    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   Entry entry = Entry.newBuilder().build();
-   *   UpdateEntryRequest request = UpdateEntryRequest.newBuilder()
-   *     .setEntry(entry)
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteEntryRequest request = DeleteEntryRequest.newBuilder()
+   *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Entry> future = dataCatalogClient.updateEntryCallable().futureCall(request);
+   *   ApiFuture<Void> future = dataCatalogClient.deleteEntryCallable().futureCall(request);
    *   // Do something
-   *   Entry response = future.get();
+   *   future.get();
    * }
    *
*/ - public final UnaryCallable updateEntryCallable() { - return stub.updateEntryCallable(); + public final UnaryCallable deleteEntryCallable() { + return stub.deleteEntryCallable(); } // AUTO-GENERATED DOCUMENTATION AND METHOD @@ -2369,6 +1910,120 @@ public final UnaryCallable updateTagTempl return stub.updateTagTemplateCallable(); } + // 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplate(name, force);
+   * }
+   *
+ * + * @param name Required. The name of the tag template to delete. Example: + *

* 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(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 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplate(name.toString(), force);
+   * }
+   *
+ * + * @param name Required. The name of the tag template to delete. Example: + *

* 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) { + 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
+   *     .build();
+   *   dataCatalogClient.deleteTagTemplate(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+   *   boolean force = false;
+   *   DeleteTagTemplateRequest request = DeleteTagTemplateRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setForce(force)
+   *     .build();
+   *   ApiFuture<Void> future = dataCatalogClient.deleteTagTemplateCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteTagTemplateCallable() { + return stub.deleteTagTemplateCallable(); + } + // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Creates a field in a tag template. The user should enable the Data Catalog API in the project @@ -2797,24 +2452,145 @@ public final TagTemplateField renameTagTemplateField(String name, String newTagT * String newTagTemplateFieldId = ""; * RenameTagTemplateFieldRequest request = RenameTagTemplateFieldRequest.newBuilder() * .setName(name.toString()) - * .setNewTagTemplateFieldId(newTagTemplateFieldId) + * .setNewTagTemplateFieldId(newTagTemplateFieldId) + * .build(); + * TagTemplateField response = dataCatalogClient.renameTagTemplateField(request); + * } + * + * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final TagTemplateField renameTagTemplateField(RenameTagTemplateFieldRequest request) { + return renameTagTemplateFieldCallable().call(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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   String newTagTemplateFieldId = "";
+   *   RenameTagTemplateFieldRequest request = RenameTagTemplateFieldRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setNewTagTemplateFieldId(newTagTemplateFieldId)
+   *     .build();
+   *   ApiFuture<TagTemplateField> future = dataCatalogClient.renameTagTemplateFieldCallable().futureCall(request);
+   *   // Do something
+   *   TagTemplateField response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable + renameTagTemplateFieldCallable() { + return stub.renameTagTemplateFieldCallable(); + } + + // 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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplateField(name, force);
+   * }
+   *
+ * + * @param name Required. The name of the tag template field to delete. Example: + *

* + * 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(TagTemplateFieldName name, boolean force) { + DeleteTagTemplateFieldRequest request = + DeleteTagTemplateFieldRequest.newBuilder() + .setName(name == null ? null : name.toString()) + .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). + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
+   *   boolean force = false;
+   *   dataCatalogClient.deleteTagTemplateField(name.toString(), force);
+   * }
+   *
+ * + * @param name Required. The name of the tag template field to delete. Example: + *

* + * 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). + * + *

Sample 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();
-   *   TagTemplateField response = dataCatalogClient.renameTagTemplateField(request);
+   *   dataCatalogClient.deleteTagTemplateField(request);
    * }
    *
* * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final TagTemplateField renameTagTemplateField(RenameTagTemplateFieldRequest request) { - return renameTagTemplateFieldCallable().call(request); + public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request) { + deleteTagTemplateFieldCallable().call(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 + * 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). * *

Sample code: @@ -2822,20 +2598,20 @@ public final TagTemplateField renameTagTemplateField(RenameTagTemplateFieldReque * 


    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   TagTemplateFieldName name = TagTemplateFieldName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]", "[FIELD]");
-   *   String newTagTemplateFieldId = "";
-   *   RenameTagTemplateFieldRequest request = RenameTagTemplateFieldRequest.newBuilder()
+   *   boolean force = false;
+   *   DeleteTagTemplateFieldRequest request = DeleteTagTemplateFieldRequest.newBuilder()
    *     .setName(name.toString())
-   *     .setNewTagTemplateFieldId(newTagTemplateFieldId)
+   *     .setForce(force)
    *     .build();
-   *   ApiFuture<TagTemplateField> future = dataCatalogClient.renameTagTemplateFieldCallable().futureCall(request);
+   *   ApiFuture<Void> future = dataCatalogClient.deleteTagTemplateFieldCallable().futureCall(request);
    *   // Do something
-   *   TagTemplateField response = future.get();
+   *   future.get();
    * }
    *
*/ - public final UnaryCallable - renameTagTemplateFieldCallable() { - return stub.renameTagTemplateFieldCallable(); + public final UnaryCallable + deleteTagTemplateFieldCallable() { + return stub.deleteTagTemplateFieldCallable(); } // AUTO-GENERATED DOCUMENTATION AND METHOD @@ -3058,6 +2834,98 @@ public final UnaryCallable updateTagCallable() { return stub.updateTagCallable(); } + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a tag. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteTag(name);
+   * }
+   *
+ * + * @param name Required. The name of the tag to delete. Example: + *

* + * 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. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   dataCatalogClient.deleteTag(name.toString());
+   * }
+   *
+ * + * @param name Required. The name of the tag to delete. Example: + *

* + * 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. + * + *

Sample 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);
+   * }
+   *
+ * + * @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); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a tag. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   DeleteTagRequest request = DeleteTagRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Void> future = dataCatalogClient.deleteTagCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteTagCallable() { + return stub.deleteTagCallable(); + } + // AUTO-GENERATED DOCUMENTATION AND METHOD /** * Lists the tags on an [Entry][google.cloud.datacatalog.v1beta1.Entry]. @@ -3329,6 +3197,138 @@ public final UnaryCallable 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. + * + *

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. + * + *

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. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource);
+   * }
+   *
+ * + * @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. + * + *

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. + * + *

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. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   Policy response = dataCatalogClient.getIamPolicy(resource.toString());
+   * }
+   *
+ * + * @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. + * + *

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. + * + *

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. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
+   *   Policy response = dataCatalogClient.getIamPolicy(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Policy getIamPolicy(GetIamPolicyRequest request) { + return getIamPolicyCallable().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. + * + *

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. + * + *

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. + * + *

Sample code: + * + * 


+   * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
+   *   ApiFuture<Policy> future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
+   *   // Do something
+   *   Policy response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable 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 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 96be6c13..0db7a1b1 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 @@ -57,16 +57,16 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of deleteEntryGroup to 30 seconds: + *

For example, to set the total timeout of getEntry to 30 seconds: * * 

  * 
  * DataCatalogSettings.Builder dataCatalogSettingsBuilder =
  *     DataCatalogSettings.newBuilder();
  * dataCatalogSettingsBuilder
- *     .deleteEntryGroupSettings()
+ *     .getEntrySettings()
  *     .setRetrySettings(
- *         dataCatalogSettingsBuilder.deleteEntryGroupSettings().getRetrySettings().toBuilder()
+ *         dataCatalogSettingsBuilder.getEntrySettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DataCatalogSettings dataCatalogSettings = dataCatalogSettingsBuilder.build();
@@ -82,16 +82,6 @@ public class DataCatalogSettings extends ClientSettings {
     return ((DataCatalogStubSettings) getStubSettings()).searchCatalogSettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteEntryGroup. */
-  public UnaryCallSettings deleteEntryGroupSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteEntryGroupSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteEntry. */
-  public UnaryCallSettings deleteEntrySettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteEntrySettings();
-  }
-
   /** Returns the object with the settings used for calls to getEntry. */
   public UnaryCallSettings getEntrySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).getEntrySettings();
@@ -102,26 +92,6 @@ public UnaryCallSettings lookupEntrySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).lookupEntrySettings();
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplate. */
-  public UnaryCallSettings deleteTagTemplateSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
-  public UnaryCallSettings deleteTagTemplateFieldSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateFieldSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteTag. */
-  public UnaryCallSettings deleteTagSettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).deleteTagSettings();
-  }
-
-  /** Returns the object with the settings used for calls to getIamPolicy. */
-  public UnaryCallSettings getIamPolicySettings() {
-    return ((DataCatalogStubSettings) getStubSettings()).getIamPolicySettings();
-  }
-
   /** Returns the object with the settings used for calls to createEntryGroup. */
   public UnaryCallSettings createEntryGroupSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).createEntryGroupSettings();
@@ -137,6 +107,11 @@ public UnaryCallSettings getEntryGroupSettings
     return ((DataCatalogStubSettings) getStubSettings()).getEntryGroupSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteEntryGroup. */
+  public UnaryCallSettings deleteEntryGroupSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteEntryGroupSettings();
+  }
+
   /** Returns the object with the settings used for calls to listEntryGroups. */
   public PagedCallSettings<
           ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
@@ -154,6 +129,11 @@ public UnaryCallSettings updateEntrySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).updateEntrySettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteEntry. */
+  public UnaryCallSettings deleteEntrySettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteEntrySettings();
+  }
+
   /** Returns the object with the settings used for calls to listEntries. */
   public PagedCallSettings
       listEntriesSettings() {
@@ -175,6 +155,11 @@ public UnaryCallSettings updateTagTemplat
     return ((DataCatalogStubSettings) getStubSettings()).updateTagTemplateSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteTagTemplate. */
+  public UnaryCallSettings deleteTagTemplateSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateSettings();
+  }
+
   /** Returns the object with the settings used for calls to createTagTemplateField. */
   public UnaryCallSettings
       createTagTemplateFieldSettings() {
@@ -193,6 +178,11 @@ public UnaryCallSettings updateTagTemplat
     return ((DataCatalogStubSettings) getStubSettings()).renameTagTemplateFieldSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
+  public UnaryCallSettings deleteTagTemplateFieldSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagTemplateFieldSettings();
+  }
+
   /** Returns the object with the settings used for calls to createTag. */
   public UnaryCallSettings createTagSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).createTagSettings();
@@ -203,6 +193,11 @@ public UnaryCallSettings updateTagSettings() {
     return ((DataCatalogStubSettings) getStubSettings()).updateTagSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteTag. */
+  public UnaryCallSettings deleteTagSettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).deleteTagSettings();
+  }
+
   /** Returns the object with the settings used for calls to listTags. */
   public PagedCallSettings
       listTagsSettings() {
@@ -214,6 +209,11 @@ public UnaryCallSettings setIamPolicySettings() {
     return ((DataCatalogStubSettings) getStubSettings()).setIamPolicySettings();
   }
 
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings getIamPolicySettings() {
+    return ((DataCatalogStubSettings) getStubSettings()).getIamPolicySettings();
+  }
+
   /** Returns the object with the settings used for calls to testIamPermissions. */
   public UnaryCallSettings
       testIamPermissionsSettings() {
@@ -323,16 +323,6 @@ public Builder applyToAllUnaryMethods(
       return getStubSettingsBuilder().searchCatalogSettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteEntryGroup. */
-    public UnaryCallSettings.Builder deleteEntryGroupSettings() {
-      return getStubSettingsBuilder().deleteEntryGroupSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteEntry. */
-    public UnaryCallSettings.Builder deleteEntrySettings() {
-      return getStubSettingsBuilder().deleteEntrySettings();
-    }
-
     /** Returns the builder for the settings used for calls to getEntry. */
     public UnaryCallSettings.Builder getEntrySettings() {
       return getStubSettingsBuilder().getEntrySettings();
@@ -343,27 +333,6 @@ public UnaryCallSettings.Builder lookupEntrySettings(
       return getStubSettingsBuilder().lookupEntrySettings();
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
-    public UnaryCallSettings.Builder deleteTagTemplateSettings() {
-      return getStubSettingsBuilder().deleteTagTemplateSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
-    public UnaryCallSettings.Builder
-        deleteTagTemplateFieldSettings() {
-      return getStubSettingsBuilder().deleteTagTemplateFieldSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteTag. */
-    public UnaryCallSettings.Builder deleteTagSettings() {
-      return getStubSettingsBuilder().deleteTagSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to getIamPolicy. */
-    public UnaryCallSettings.Builder getIamPolicySettings() {
-      return getStubSettingsBuilder().getIamPolicySettings();
-    }
-
     /** Returns the builder for the settings used for calls to createEntryGroup. */
     public UnaryCallSettings.Builder
         createEntryGroupSettings() {
@@ -381,6 +350,11 @@ public UnaryCallSettings.Builder getEntryGroup
       return getStubSettingsBuilder().getEntryGroupSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteEntryGroup. */
+    public UnaryCallSettings.Builder deleteEntryGroupSettings() {
+      return getStubSettingsBuilder().deleteEntryGroupSettings();
+    }
+
     /** Returns the builder for the settings used for calls to listEntryGroups. */
     public PagedCallSettings.Builder<
             ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
@@ -398,6 +372,11 @@ public UnaryCallSettings.Builder updateEntrySettings(
       return getStubSettingsBuilder().updateEntrySettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteEntry. */
+    public UnaryCallSettings.Builder deleteEntrySettings() {
+      return getStubSettingsBuilder().deleteEntrySettings();
+    }
+
     /** Returns the builder for the settings used for calls to listEntries. */
     public PagedCallSettings.Builder<
             ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
@@ -422,6 +401,11 @@ public UnaryCallSettings.Builder getTagTempl
       return getStubSettingsBuilder().updateTagTemplateSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
+    public UnaryCallSettings.Builder deleteTagTemplateSettings() {
+      return getStubSettingsBuilder().deleteTagTemplateSettings();
+    }
+
     /** Returns the builder for the settings used for calls to createTagTemplateField. */
     public UnaryCallSettings.Builder
         createTagTemplateFieldSettings() {
@@ -440,6 +424,12 @@ public UnaryCallSettings.Builder getTagTempl
       return getStubSettingsBuilder().renameTagTemplateFieldSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
+    public UnaryCallSettings.Builder
+        deleteTagTemplateFieldSettings() {
+      return getStubSettingsBuilder().deleteTagTemplateFieldSettings();
+    }
+
     /** Returns the builder for the settings used for calls to createTag. */
     public UnaryCallSettings.Builder createTagSettings() {
       return getStubSettingsBuilder().createTagSettings();
@@ -450,6 +440,11 @@ public UnaryCallSettings.Builder updateTagSettings() {
       return getStubSettingsBuilder().updateTagSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteTag. */
+    public UnaryCallSettings.Builder deleteTagSettings() {
+      return getStubSettingsBuilder().deleteTagSettings();
+    }
+
     /** Returns the builder for the settings used for calls to listTags. */
     public PagedCallSettings.Builder
         listTagsSettings() {
@@ -461,6 +456,11 @@ public UnaryCallSettings.Builder setIamPolicySettin
       return getStubSettingsBuilder().setIamPolicySettings();
     }
 
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder getIamPolicySettings() {
+      return getStubSettingsBuilder().getIamPolicySettings();
+    }
+
     /** Returns the builder for the settings used for calls to testIamPermissions. */
     public UnaryCallSettings.Builder
         testIamPermissionsSettings() {
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 b0ee4b3e..7e81b8c2 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,8 +29,8 @@
  * 
  * 
  * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
- *   EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
- *   dataCatalogClient.deleteEntryGroup(name);
+ *   EntryName name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+ *   Entry response = dataCatalogClient.getEntry(name);
  * }
  * 
  * 

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 cf044518..41969a90 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
@@ -83,14 +83,6 @@ public UnaryCallable searchCatalogC
     throw new UnsupportedOperationException("Not implemented: searchCatalogCallable()");
   }
 
-  public UnaryCallable deleteEntryGroupCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteEntryGroupCallable()");
-  }
-
-  public UnaryCallable deleteEntryCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteEntryCallable()");
-  }
-
   public UnaryCallable getEntryCallable() {
     throw new UnsupportedOperationException("Not implemented: getEntryCallable()");
   }
@@ -99,22 +91,6 @@ public UnaryCallable lookupEntryCallable() {
     throw new UnsupportedOperationException("Not implemented: lookupEntryCallable()");
   }
 
-  public UnaryCallable deleteTagTemplateCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateCallable()");
-  }
-
-  public UnaryCallable deleteTagTemplateFieldCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateFieldCallable()");
-  }
-
-  public UnaryCallable deleteTagCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTagCallable()");
-  }
-
-  public UnaryCallable getIamPolicyCallable() {
-    throw new UnsupportedOperationException("Not implemented: getIamPolicyCallable()");
-  }
-
   public UnaryCallable createEntryGroupCallable() {
     throw new UnsupportedOperationException("Not implemented: createEntryGroupCallable()");
   }
@@ -127,6 +103,10 @@ public UnaryCallable getEntryGroupCallable() {
     throw new UnsupportedOperationException("Not implemented: getEntryGroupCallable()");
   }
 
+  public UnaryCallable deleteEntryGroupCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteEntryGroupCallable()");
+  }
+
   public UnaryCallable
       listEntryGroupsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listEntryGroupsPagedCallable()");
@@ -144,6 +124,10 @@ public UnaryCallable updateEntryCallable() {
     throw new UnsupportedOperationException("Not implemented: updateEntryCallable()");
   }
 
+  public UnaryCallable deleteEntryCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteEntryCallable()");
+  }
+
   public UnaryCallable listEntriesPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listEntriesPagedCallable()");
   }
@@ -164,6 +148,10 @@ public UnaryCallable updateTagTemplateCal
     throw new UnsupportedOperationException("Not implemented: updateTagTemplateCallable()");
   }
 
+  public UnaryCallable deleteTagTemplateCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateCallable()");
+  }
+
   public UnaryCallable
       createTagTemplateFieldCallable() {
     throw new UnsupportedOperationException("Not implemented: createTagTemplateFieldCallable()");
@@ -179,6 +167,10 @@ public UnaryCallable updateTagTemplateCal
     throw new UnsupportedOperationException("Not implemented: renameTagTemplateFieldCallable()");
   }
 
+  public UnaryCallable deleteTagTemplateFieldCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagTemplateFieldCallable()");
+  }
+
   public UnaryCallable createTagCallable() {
     throw new UnsupportedOperationException("Not implemented: createTagCallable()");
   }
@@ -187,6 +179,10 @@ public UnaryCallable updateTagCallable() {
     throw new UnsupportedOperationException("Not implemented: updateTagCallable()");
   }
 
+  public UnaryCallable deleteTagCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTagCallable()");
+  }
+
   public UnaryCallable listTagsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listTagsPagedCallable()");
   }
@@ -199,6 +195,10 @@ public UnaryCallable setIamPolicyCallable() {
     throw new UnsupportedOperationException("Not implemented: setIamPolicyCallable()");
   }
 
+  public UnaryCallable getIamPolicyCallable() {
+    throw new UnsupportedOperationException("Not implemented: getIamPolicyCallable()");
+  }
+
   public UnaryCallable
       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 4263a4be..0d28c178 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
@@ -106,16 +106,16 @@
  * 
The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * 
For example, to set the total timeout of deleteEntryGroup to 30 seconds:
+ * 
For example, to set the total timeout of getEntry to 30 seconds:
  *
  * 
  * 
  * DataCatalogStubSettings.Builder dataCatalogSettingsBuilder =
  *     DataCatalogStubSettings.newBuilder();
  * dataCatalogSettingsBuilder
- *     .deleteEntryGroupSettings()
+ *     .getEntrySettings()
  *     .setRetrySettings(
- *         dataCatalogSettingsBuilder.deleteEntryGroupSettings().getRetrySettings().toBuilder()
+ *         dataCatalogSettingsBuilder.getEntrySettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * DataCatalogStubSettings dataCatalogSettings = dataCatalogSettingsBuilder.build();
@@ -132,39 +132,39 @@ public class DataCatalogStubSettings extends StubSettings
       searchCatalogSettings;
-  private final UnaryCallSettings deleteEntryGroupSettings;
-  private final UnaryCallSettings deleteEntrySettings;
   private final UnaryCallSettings getEntrySettings;
   private final UnaryCallSettings lookupEntrySettings;
-  private final UnaryCallSettings deleteTagTemplateSettings;
-  private final UnaryCallSettings
-      deleteTagTemplateFieldSettings;
-  private final UnaryCallSettings deleteTagSettings;
-  private final UnaryCallSettings getIamPolicySettings;
   private final UnaryCallSettings createEntryGroupSettings;
   private final UnaryCallSettings updateEntryGroupSettings;
   private final UnaryCallSettings getEntryGroupSettings;
+  private final UnaryCallSettings deleteEntryGroupSettings;
   private final PagedCallSettings<
           ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
       listEntryGroupsSettings;
   private final UnaryCallSettings createEntrySettings;
   private final UnaryCallSettings updateEntrySettings;
+  private final UnaryCallSettings deleteEntrySettings;
   private final PagedCallSettings
       listEntriesSettings;
   private final UnaryCallSettings createTagTemplateSettings;
   private final UnaryCallSettings getTagTemplateSettings;
   private final UnaryCallSettings updateTagTemplateSettings;
+  private final UnaryCallSettings deleteTagTemplateSettings;
   private final UnaryCallSettings
       createTagTemplateFieldSettings;
   private final UnaryCallSettings
       updateTagTemplateFieldSettings;
   private final UnaryCallSettings
       renameTagTemplateFieldSettings;
+  private final UnaryCallSettings
+      deleteTagTemplateFieldSettings;
   private final UnaryCallSettings createTagSettings;
   private final UnaryCallSettings updateTagSettings;
+  private final UnaryCallSettings deleteTagSettings;
   private final PagedCallSettings
       listTagsSettings;
   private final UnaryCallSettings setIamPolicySettings;
+  private final UnaryCallSettings getIamPolicySettings;
   private final UnaryCallSettings
       testIamPermissionsSettings;
 
@@ -174,16 +174,6 @@ public class DataCatalogStubSettings extends StubSettings deleteEntryGroupSettings() {
-    return deleteEntryGroupSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteEntry. */
-  public UnaryCallSettings deleteEntrySettings() {
-    return deleteEntrySettings;
-  }
-
   /** Returns the object with the settings used for calls to getEntry. */
   public UnaryCallSettings getEntrySettings() {
     return getEntrySettings;
@@ -194,26 +184,6 @@ public UnaryCallSettings lookupEntrySettings() {
     return lookupEntrySettings;
   }
 
-  /** Returns the object with the settings used for calls to deleteTagTemplate. */
-  public UnaryCallSettings deleteTagTemplateSettings() {
-    return deleteTagTemplateSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
-  public UnaryCallSettings deleteTagTemplateFieldSettings() {
-    return deleteTagTemplateFieldSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteTag. */
-  public UnaryCallSettings deleteTagSettings() {
-    return deleteTagSettings;
-  }
-
-  /** Returns the object with the settings used for calls to getIamPolicy. */
-  public UnaryCallSettings getIamPolicySettings() {
-    return getIamPolicySettings;
-  }
-
   /** Returns the object with the settings used for calls to createEntryGroup. */
   public UnaryCallSettings createEntryGroupSettings() {
     return createEntryGroupSettings;
@@ -229,6 +199,11 @@ public UnaryCallSettings getEntryGroupSettings
     return getEntryGroupSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteEntryGroup. */
+  public UnaryCallSettings deleteEntryGroupSettings() {
+    return deleteEntryGroupSettings;
+  }
+
   /** Returns the object with the settings used for calls to listEntryGroups. */
   public PagedCallSettings<
           ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
@@ -246,6 +221,11 @@ public UnaryCallSettings updateEntrySettings() {
     return updateEntrySettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteEntry. */
+  public UnaryCallSettings deleteEntrySettings() {
+    return deleteEntrySettings;
+  }
+
   /** Returns the object with the settings used for calls to listEntries. */
   public PagedCallSettings
       listEntriesSettings() {
@@ -267,6 +247,11 @@ public UnaryCallSettings updateTagTemplat
     return updateTagTemplateSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteTagTemplate. */
+  public UnaryCallSettings deleteTagTemplateSettings() {
+    return deleteTagTemplateSettings;
+  }
+
   /** Returns the object with the settings used for calls to createTagTemplateField. */
   public UnaryCallSettings
       createTagTemplateFieldSettings() {
@@ -285,6 +270,11 @@ public UnaryCallSettings updateTagTemplat
     return renameTagTemplateFieldSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteTagTemplateField. */
+  public UnaryCallSettings deleteTagTemplateFieldSettings() {
+    return deleteTagTemplateFieldSettings;
+  }
+
   /** Returns the object with the settings used for calls to createTag. */
   public UnaryCallSettings createTagSettings() {
     return createTagSettings;
@@ -295,6 +285,11 @@ public UnaryCallSettings updateTagSettings() {
     return updateTagSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteTag. */
+  public UnaryCallSettings deleteTagSettings() {
+    return deleteTagSettings;
+  }
+
   /** Returns the object with the settings used for calls to listTags. */
   public PagedCallSettings
       listTagsSettings() {
@@ -306,6 +301,11 @@ public UnaryCallSettings setIamPolicySettings() {
     return setIamPolicySettings;
   }
 
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings getIamPolicySettings() {
+    return getIamPolicySettings;
+  }
+
   /** Returns the object with the settings used for calls to testIamPermissions. */
   public UnaryCallSettings
       testIamPermissionsSettings() {
@@ -382,31 +382,31 @@ protected DataCatalogStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
     searchCatalogSettings = settingsBuilder.searchCatalogSettings().build();
-    deleteEntryGroupSettings = settingsBuilder.deleteEntryGroupSettings().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();
+    deleteEntryGroupSettings = settingsBuilder.deleteEntryGroupSettings().build();
     listEntryGroupsSettings = settingsBuilder.listEntryGroupsSettings().build();
     createEntrySettings = settingsBuilder.createEntrySettings().build();
     updateEntrySettings = settingsBuilder.updateEntrySettings().build();
+    deleteEntrySettings = settingsBuilder.deleteEntrySettings().build();
     listEntriesSettings = settingsBuilder.listEntriesSettings().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();
   }
 
@@ -634,27 +634,21 @@ public static class Builder extends StubSettings.Builder
         searchCatalogSettings;
-    private final UnaryCallSettings.Builder
-        deleteEntryGroupSettings;
-    private final UnaryCallSettings.Builder deleteEntrySettings;
     private final UnaryCallSettings.Builder getEntrySettings;
     private final UnaryCallSettings.Builder lookupEntrySettings;
-    private final UnaryCallSettings.Builder
-        deleteTagTemplateSettings;
-    private final UnaryCallSettings.Builder
-        deleteTagTemplateFieldSettings;
-    private final UnaryCallSettings.Builder deleteTagSettings;
-    private final UnaryCallSettings.Builder getIamPolicySettings;
     private final UnaryCallSettings.Builder
         createEntryGroupSettings;
     private final UnaryCallSettings.Builder
         updateEntryGroupSettings;
     private final UnaryCallSettings.Builder getEntryGroupSettings;
+    private final UnaryCallSettings.Builder
+        deleteEntryGroupSettings;
     private final PagedCallSettings.Builder<
             ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
         listEntryGroupsSettings;
     private final UnaryCallSettings.Builder createEntrySettings;
     private final UnaryCallSettings.Builder updateEntrySettings;
+    private final UnaryCallSettings.Builder deleteEntrySettings;
     private final PagedCallSettings.Builder<
             ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
         listEntriesSettings;
@@ -664,18 +658,24 @@ public static class Builder extends StubSettings.Builder
         updateTagTemplateSettings;
+    private final UnaryCallSettings.Builder
+        deleteTagTemplateSettings;
     private final UnaryCallSettings.Builder
         createTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder
         updateTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder
         renameTagTemplateFieldSettings;
+    private final UnaryCallSettings.Builder
+        deleteTagTemplateFieldSettings;
     private final UnaryCallSettings.Builder createTagSettings;
     private final UnaryCallSettings.Builder updateTagSettings;
+    private final UnaryCallSettings.Builder deleteTagSettings;
     private final PagedCallSettings.Builder<
             ListTagsRequest, ListTagsResponse, ListTagsPagedResponse>
         listTagsSettings;
     private final UnaryCallSettings.Builder setIamPolicySettings;
+    private final UnaryCallSettings.Builder getIamPolicySettings;
     private final UnaryCallSettings.Builder
         testIamPermissionsSettings;
 
@@ -686,11 +686,13 @@ public static class Builder extends StubSettings.Builder> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -704,12 +706,22 @@ public static class Builder extends StubSettings.Builder>of(
               searchCatalogSettings,
-              deleteEntryGroupSettings,
-              deleteEntrySettings,
               getEntrySettings,
               lookupEntrySettings,
-              deleteTagTemplateSettings,
-              deleteTagTemplateFieldSettings,
-              deleteTagSettings,
-              getIamPolicySettings,
               createEntryGroupSettings,
               updateEntryGroupSettings,
               getEntryGroupSettings,
+              deleteEntryGroupSettings,
               listEntryGroupsSettings,
               createEntrySettings,
               updateEntrySettings,
+              deleteEntrySettings,
               listEntriesSettings,
               createTagTemplateSettings,
               getTagTemplateSettings,
               updateTagTemplateSettings,
+              deleteTagTemplateSettings,
               createTagTemplateFieldSettings,
               updateTagTemplateFieldSettings,
               renameTagTemplateFieldSettings,
+              deleteTagTemplateFieldSettings,
               createTagSettings,
               updateTagSettings,
+              deleteTagSettings,
               listTagsSettings,
               setIamPolicySettings,
+              getIamPolicySettings,
               testIamPermissionsSettings);
 
       initDefaults(this);
@@ -820,138 +832,138 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .searchCatalogSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteEntryGroupSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .lookupEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteTagTemplateSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteTagTemplateFieldSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deleteTagSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .getIamPolicySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createEntryGroupSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateEntryGroupSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getEntryGroupSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
+
+      builder
+          .deleteEntryGroupSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listEntryGroupsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .createEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateEntrySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .deleteEntrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listEntriesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .createTagTemplateSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getTagTemplateSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateTagTemplateSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .deleteTagTemplateSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createTagTemplateFieldSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateTagTemplateFieldSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .renameTagTemplateFieldSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .deleteTagTemplateFieldSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createTagSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .updateTagSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .deleteTagSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listTagsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .setIamPolicySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
+
+      builder
+          .getIamPolicySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .testIamPermissionsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       return builder;
     }
@@ -960,61 +972,61 @@ protected Builder(DataCatalogStubSettings settings) {
       super(settings);
 
       searchCatalogSettings = settings.searchCatalogSettings.toBuilder();
-      deleteEntryGroupSettings = settings.deleteEntryGroupSettings.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();
+      deleteEntryGroupSettings = settings.deleteEntryGroupSettings.toBuilder();
       listEntryGroupsSettings = settings.listEntryGroupsSettings.toBuilder();
       createEntrySettings = settings.createEntrySettings.toBuilder();
       updateEntrySettings = settings.updateEntrySettings.toBuilder();
+      deleteEntrySettings = settings.deleteEntrySettings.toBuilder();
       listEntriesSettings = settings.listEntriesSettings.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.>of(
               searchCatalogSettings,
-              deleteEntryGroupSettings,
-              deleteEntrySettings,
               getEntrySettings,
               lookupEntrySettings,
-              deleteTagTemplateSettings,
-              deleteTagTemplateFieldSettings,
-              deleteTagSettings,
-              getIamPolicySettings,
               createEntryGroupSettings,
               updateEntryGroupSettings,
               getEntryGroupSettings,
+              deleteEntryGroupSettings,
               listEntryGroupsSettings,
               createEntrySettings,
               updateEntrySettings,
+              deleteEntrySettings,
               listEntriesSettings,
               createTagTemplateSettings,
               getTagTemplateSettings,
               updateTagTemplateSettings,
+              deleteTagTemplateSettings,
               createTagTemplateFieldSettings,
               updateTagTemplateFieldSettings,
               renameTagTemplateFieldSettings,
+              deleteTagTemplateFieldSettings,
               createTagSettings,
               updateTagSettings,
+              deleteTagSettings,
               listTagsSettings,
               setIamPolicySettings,
+              getIamPolicySettings,
               testIamPermissionsSettings);
     }
 
@@ -1041,16 +1053,6 @@ public Builder applyToAllUnaryMethods(
       return searchCatalogSettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteEntryGroup. */
-    public UnaryCallSettings.Builder deleteEntryGroupSettings() {
-      return deleteEntryGroupSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteEntry. */
-    public UnaryCallSettings.Builder deleteEntrySettings() {
-      return deleteEntrySettings;
-    }
-
     /** Returns the builder for the settings used for calls to getEntry. */
     public UnaryCallSettings.Builder getEntrySettings() {
       return getEntrySettings;
@@ -1061,27 +1063,6 @@ public UnaryCallSettings.Builder lookupEntrySettings(
       return lookupEntrySettings;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
-    public UnaryCallSettings.Builder deleteTagTemplateSettings() {
-      return deleteTagTemplateSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
-    public UnaryCallSettings.Builder
-        deleteTagTemplateFieldSettings() {
-      return deleteTagTemplateFieldSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteTag. */
-    public UnaryCallSettings.Builder deleteTagSettings() {
-      return deleteTagSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to getIamPolicy. */
-    public UnaryCallSettings.Builder getIamPolicySettings() {
-      return getIamPolicySettings;
-    }
-
     /** Returns the builder for the settings used for calls to createEntryGroup. */
     public UnaryCallSettings.Builder
         createEntryGroupSettings() {
@@ -1099,6 +1080,11 @@ public UnaryCallSettings.Builder getEntryGroup
       return getEntryGroupSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteEntryGroup. */
+    public UnaryCallSettings.Builder deleteEntryGroupSettings() {
+      return deleteEntryGroupSettings;
+    }
+
     /** Returns the builder for the settings used for calls to listEntryGroups. */
     public PagedCallSettings.Builder<
             ListEntryGroupsRequest, ListEntryGroupsResponse, ListEntryGroupsPagedResponse>
@@ -1116,6 +1102,11 @@ public UnaryCallSettings.Builder updateEntrySettings(
       return updateEntrySettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteEntry. */
+    public UnaryCallSettings.Builder deleteEntrySettings() {
+      return deleteEntrySettings;
+    }
+
     /** Returns the builder for the settings used for calls to listEntries. */
     public PagedCallSettings.Builder<
             ListEntriesRequest, ListEntriesResponse, ListEntriesPagedResponse>
@@ -1140,6 +1131,11 @@ public UnaryCallSettings.Builder getTagTempl
       return updateTagTemplateSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteTagTemplate. */
+    public UnaryCallSettings.Builder deleteTagTemplateSettings() {
+      return deleteTagTemplateSettings;
+    }
+
     /** Returns the builder for the settings used for calls to createTagTemplateField. */
     public UnaryCallSettings.Builder
         createTagTemplateFieldSettings() {
@@ -1158,6 +1154,12 @@ public UnaryCallSettings.Builder getTagTempl
       return renameTagTemplateFieldSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteTagTemplateField. */
+    public UnaryCallSettings.Builder
+        deleteTagTemplateFieldSettings() {
+      return deleteTagTemplateFieldSettings;
+    }
+
     /** Returns the builder for the settings used for calls to createTag. */
     public UnaryCallSettings.Builder createTagSettings() {
       return createTagSettings;
@@ -1168,6 +1170,11 @@ public UnaryCallSettings.Builder updateTagSettings() {
       return updateTagSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteTag. */
+    public UnaryCallSettings.Builder deleteTagSettings() {
+      return deleteTagSettings;
+    }
+
     /** Returns the builder for the settings used for calls to listTags. */
     public PagedCallSettings.Builder
         listTagsSettings() {
@@ -1179,6 +1186,11 @@ public UnaryCallSettings.Builder setIamPolicySettin
       return setIamPolicySettings;
     }
 
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder getIamPolicySettings() {
+      return getIamPolicySettings;
+    }
+
     /** Returns the builder for the settings used for calls to testIamPermissions. */
     public UnaryCallSettings.Builder
         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 93ab6ec5..7f7f9a58 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
@@ -95,22 +95,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(SearchCatalogResponse.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor
-      deleteEntryGroupMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteEntryGroup")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteEntryGroupRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor deleteEntryMethodDescriptor =
-      MethodDescriptor.newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteEntry")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteEntryRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor getEntryMethodDescriptor =
       MethodDescriptor.newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -125,39 +109,6 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(LookupEntryRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
           .build();
-  private static final MethodDescriptor
-      deleteTagTemplateMethodDescriptor =
-          MethodDescriptor.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
-      deleteTagTemplateFieldMethodDescriptor =
-          MethodDescriptor.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 deleteTagMethodDescriptor =
-      MethodDescriptor.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 getIamPolicyMethodDescriptor =
-      MethodDescriptor.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
       createEntryGroupMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -185,6 +136,15 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(GetEntryGroupRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(EntryGroup.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor
+      deleteEntryGroupMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteEntryGroup")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteEntryGroupRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
   private static final MethodDescriptor
       listEntryGroupsMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -209,6 +169,13 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(UpdateEntryRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Entry.getDefaultInstance()))
           .build();
+  private static final MethodDescriptor deleteEntryMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.datacatalog.v1beta1.DataCatalog/DeleteEntry")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteEntryRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor
       listEntriesMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -245,6 +212,15 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(UpdateTagTemplateRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(TagTemplate.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor
+      deleteTagTemplateMethodDescriptor =
+          MethodDescriptor.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
       createTagTemplateFieldMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -275,6 +251,16 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
                   ProtoUtils.marshaller(RenameTagTemplateFieldRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(TagTemplateField.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor
+      deleteTagTemplateFieldMethodDescriptor =
+          MethodDescriptor.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 createTagMethodDescriptor =
       MethodDescriptor.newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -289,6 +275,13 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(UpdateTagRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Tag.getDefaultInstance()))
           .build();
+  private static final MethodDescriptor deleteTagMethodDescriptor =
+      MethodDescriptor.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
       listTagsMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -304,6 +297,13 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
           .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
           .build();
+  private static final MethodDescriptor getIamPolicyMethodDescriptor =
+      MethodDescriptor.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
       testIamPermissionsMethodDescriptor =
           MethodDescriptor.newBuilder()
@@ -320,40 +320,40 @@ public class GrpcDataCatalogStub extends DataCatalogStub {
   private final UnaryCallable searchCatalogCallable;
   private final UnaryCallable
       searchCatalogPagedCallable;
-  private final UnaryCallable deleteEntryGroupCallable;
-  private final UnaryCallable deleteEntryCallable;
   private final UnaryCallable getEntryCallable;
   private final UnaryCallable lookupEntryCallable;
-  private final UnaryCallable deleteTagTemplateCallable;
-  private final UnaryCallable deleteTagTemplateFieldCallable;
-  private final UnaryCallable deleteTagCallable;
-  private final UnaryCallable getIamPolicyCallable;
   private final UnaryCallable createEntryGroupCallable;
   private final UnaryCallable updateEntryGroupCallable;
   private final UnaryCallable getEntryGroupCallable;
+  private final UnaryCallable deleteEntryGroupCallable;
   private final UnaryCallable
       listEntryGroupsCallable;
   private final UnaryCallable
       listEntryGroupsPagedCallable;
   private final UnaryCallable createEntryCallable;
   private final UnaryCallable updateEntryCallable;
+  private final UnaryCallable deleteEntryCallable;
   private final UnaryCallable listEntriesCallable;
   private final UnaryCallable
       listEntriesPagedCallable;
   private final UnaryCallable createTagTemplateCallable;
   private final UnaryCallable getTagTemplateCallable;
   private final UnaryCallable updateTagTemplateCallable;
+  private final UnaryCallable deleteTagTemplateCallable;
   private final UnaryCallable
       createTagTemplateFieldCallable;
   private final UnaryCallable
       updateTagTemplateFieldCallable;
   private final UnaryCallable
       renameTagTemplateFieldCallable;
+  private final UnaryCallable deleteTagTemplateFieldCallable;
   private final UnaryCallable createTagCallable;
   private final UnaryCallable updateTagCallable;
+  private final UnaryCallable deleteTagCallable;
   private final UnaryCallable listTagsCallable;
   private final UnaryCallable listTagsPagedCallable;
   private final UnaryCallable setIamPolicyCallable;
+  private final UnaryCallable getIamPolicyCallable;
   private final UnaryCallable
       testIamPermissionsCallable;
 
@@ -400,32 +400,6 @@ protected GrpcDataCatalogStub(
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(searchCatalogMethodDescriptor)
             .build();
-    GrpcCallSettings deleteEntryGroupTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteEntryGroupRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings deleteEntryTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteEntryMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteEntryRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings getEntryTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(getEntryMethodDescriptor)
@@ -443,58 +417,6 @@ public Map extract(GetEntryRequest request) {
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(lookupEntryMethodDescriptor)
             .build();
-    GrpcCallSettings deleteTagTemplateTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteTagTemplateRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings deleteTagTemplateFieldTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteTagTemplateFieldRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings deleteTagTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(deleteTagMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(DeleteTagRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings getIamPolicyTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(getIamPolicyMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor() {
-                  @Override
-                  public Map extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings createEntryGroupTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(createEntryGroupMethodDescriptor)
@@ -535,6 +457,19 @@ public Map extract(GetEntryGroupRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings deleteEntryGroupTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteEntryGroupRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings
         listEntryGroupsTransportSettings =
             GrpcCallSettings.newBuilder()
@@ -575,6 +510,19 @@ public Map extract(UpdateEntryRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings deleteEntryTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteEntryMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteEntryRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings listEntriesTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(listEntriesMethodDescriptor)
@@ -628,6 +576,19 @@ public Map extract(UpdateTagTemplateRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings deleteTagTemplateTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteTagTemplateRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings
         createTagTemplateFieldTransportSettings =
             GrpcCallSettings.newBuilder()
@@ -670,6 +631,19 @@ public Map extract(RenameTagTemplateFieldRequest request) {
                       }
                     })
                 .build();
+    GrpcCallSettings deleteTagTemplateFieldTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteTagTemplateFieldRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings createTagTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(createTagMethodDescriptor)
@@ -696,6 +670,19 @@ public Map extract(UpdateTagRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings deleteTagTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteTagMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteTagRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings listTagsTransportSettings =
         GrpcCallSettings.newBuilder()
             .setMethodDescriptor(listTagsMethodDescriptor)
@@ -722,6 +709,19 @@ public Map extract(SetIamPolicyRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings getIamPolicyTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getIamPolicyMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(GetIamPolicyRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("resource", String.valueOf(request.getResource()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings
         testIamPermissionsTransportSettings =
             GrpcCallSettings.newBuilder()
@@ -743,34 +743,12 @@ public Map extract(TestIamPermissionsRequest request) {
     this.searchCatalogPagedCallable =
         callableFactory.createPagedCallable(
             searchCatalogTransportSettings, settings.searchCatalogSettings(), clientContext);
-    this.deleteEntryGroupCallable =
-        callableFactory.createUnaryCallable(
-            deleteEntryGroupTransportSettings, settings.deleteEntryGroupSettings(), clientContext);
-    this.deleteEntryCallable =
-        callableFactory.createUnaryCallable(
-            deleteEntryTransportSettings, settings.deleteEntrySettings(), clientContext);
     this.getEntryCallable =
         callableFactory.createUnaryCallable(
             getEntryTransportSettings, settings.getEntrySettings(), clientContext);
     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);
@@ -780,6 +758,9 @@ public Map extract(TestIamPermissionsRequest request) {
     this.getEntryGroupCallable =
         callableFactory.createUnaryCallable(
             getEntryGroupTransportSettings, settings.getEntryGroupSettings(), clientContext);
+    this.deleteEntryGroupCallable =
+        callableFactory.createUnaryCallable(
+            deleteEntryGroupTransportSettings, settings.deleteEntryGroupSettings(), clientContext);
     this.listEntryGroupsCallable =
         callableFactory.createUnaryCallable(
             listEntryGroupsTransportSettings, settings.listEntryGroupsSettings(), clientContext);
@@ -792,6 +773,9 @@ public Map extract(TestIamPermissionsRequest request) {
     this.updateEntryCallable =
         callableFactory.createUnaryCallable(
             updateEntryTransportSettings, settings.updateEntrySettings(), clientContext);
+    this.deleteEntryCallable =
+        callableFactory.createUnaryCallable(
+            deleteEntryTransportSettings, settings.deleteEntrySettings(), clientContext);
     this.listEntriesCallable =
         callableFactory.createUnaryCallable(
             listEntriesTransportSettings, settings.listEntriesSettings(), clientContext);
@@ -811,6 +795,11 @@ public Map extract(TestIamPermissionsRequest request) {
             updateTagTemplateTransportSettings,
             settings.updateTagTemplateSettings(),
             clientContext);
+    this.deleteTagTemplateCallable =
+        callableFactory.createUnaryCallable(
+            deleteTagTemplateTransportSettings,
+            settings.deleteTagTemplateSettings(),
+            clientContext);
     this.createTagTemplateFieldCallable =
         callableFactory.createUnaryCallable(
             createTagTemplateFieldTransportSettings,
@@ -826,12 +815,20 @@ public Map 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);
@@ -841,6 +838,9 @@ public Map extract(TestIamPermissionsRequest request) {
     this.setIamPolicyCallable =
         callableFactory.createUnaryCallable(
             setIamPolicyTransportSettings, settings.setIamPolicySettings(), clientContext);
+    this.getIamPolicyCallable =
+        callableFactory.createUnaryCallable(
+            getIamPolicyTransportSettings, settings.getIamPolicySettings(), clientContext);
     this.testIamPermissionsCallable =
         callableFactory.createUnaryCallable(
             testIamPermissionsTransportSettings,
@@ -859,14 +859,6 @@ public UnaryCallable searchCatalogC
     return searchCatalogCallable;
   }
 
-  public UnaryCallable deleteEntryGroupCallable() {
-    return deleteEntryGroupCallable;
-  }
-
-  public UnaryCallable deleteEntryCallable() {
-    return deleteEntryCallable;
-  }
-
   public UnaryCallable getEntryCallable() {
     return getEntryCallable;
   }
@@ -875,22 +867,6 @@ public UnaryCallable lookupEntryCallable() {
     return lookupEntryCallable;
   }
 
-  public UnaryCallable deleteTagTemplateCallable() {
-    return deleteTagTemplateCallable;
-  }
-
-  public UnaryCallable deleteTagTemplateFieldCallable() {
-    return deleteTagTemplateFieldCallable;
-  }
-
-  public UnaryCallable deleteTagCallable() {
-    return deleteTagCallable;
-  }
-
-  public UnaryCallable getIamPolicyCallable() {
-    return getIamPolicyCallable;
-  }
-
   public UnaryCallable createEntryGroupCallable() {
     return createEntryGroupCallable;
   }
@@ -903,6 +879,10 @@ public UnaryCallable getEntryGroupCallable() {
     return getEntryGroupCallable;
   }
 
+  public UnaryCallable deleteEntryGroupCallable() {
+    return deleteEntryGroupCallable;
+  }
+
   public UnaryCallable
       listEntryGroupsPagedCallable() {
     return listEntryGroupsPagedCallable;
@@ -920,6 +900,10 @@ public UnaryCallable updateEntryCallable() {
     return updateEntryCallable;
   }
 
+  public UnaryCallable deleteEntryCallable() {
+    return deleteEntryCallable;
+  }
+
   public UnaryCallable listEntriesPagedCallable() {
     return listEntriesPagedCallable;
   }
@@ -940,6 +924,10 @@ public UnaryCallable updateTagTemplateCal
     return updateTagTemplateCallable;
   }
 
+  public UnaryCallable deleteTagTemplateCallable() {
+    return deleteTagTemplateCallable;
+  }
+
   public UnaryCallable
       createTagTemplateFieldCallable() {
     return createTagTemplateFieldCallable;
@@ -955,6 +943,10 @@ public UnaryCallable updateTagTemplateCal
     return renameTagTemplateFieldCallable;
   }
 
+  public UnaryCallable deleteTagTemplateFieldCallable() {
+    return deleteTagTemplateFieldCallable;
+  }
+
   public UnaryCallable createTagCallable() {
     return createTagCallable;
   }
@@ -963,6 +955,10 @@ public UnaryCallable updateTagCallable() {
     return updateTagCallable;
   }
 
+  public UnaryCallable deleteTagCallable() {
+    return deleteTagCallable;
+  }
+
   public UnaryCallable listTagsPagedCallable() {
     return listTagsPagedCallable;
   }
@@ -975,6 +971,10 @@ public UnaryCallable setIamPolicyCallable() {
     return setIamPolicyCallable;
   }
 
+  public UnaryCallable getIamPolicyCallable() {
+    return getIamPolicyCallable;
+  }
+
   public UnaryCallable
       testIamPermissionsCallable() {
     return testIamPermissionsCallable;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerSerializationStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerSerializationStubSettings.java
index 9dd92857..e8360612 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerSerializationStubSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/PolicyTagManagerSerializationStubSettings.java
@@ -190,11 +190,13 @@ public static class Builder
       ImmutableMap.Builder> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -208,12 +210,22 @@ public static class Builder
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -248,13 +260,13 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .importTaxonomiesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
 
       builder
           .exportTaxonomiesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
 
       return builder;
     }
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 1053bf62..052d920b 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
@@ -420,11 +420,13 @@ public static class Builder extends StubSettings.Builder> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -438,12 +440,22 @@ public static class Builder extends StubSettings.Builder 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 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() {
@@ -325,166 +251,6 @@ public void lookupEntryExceptionTest() throws Exception {
     }
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteTagTemplateTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockDataCatalog.addResponse(expectedResponse);
-
-    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-    boolean force = false;
-
-    client.deleteTagTemplate(name, force);
-
-    List actualRequests = mockDataCatalog.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteTagTemplateRequest actualRequest = (DeleteTagTemplateRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, TagTemplateName.parse(actualRequest.getName()));
-    Assert.assertEquals(force, actualRequest.getForce());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteTagTemplateExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDataCatalog.addException(exception);
-
-    try {
-      TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
-      boolean force = false;
-
-      client.deleteTagTemplate(name, force);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  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 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 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 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() {
@@ -724,6 +490,43 @@ public void getEntryGroupExceptionTest2() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteEntryGroupTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    EntryGroupName name = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+
+    client.deleteEntryGroup(name);
+
+    List 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 listEntryGroupsTest() {
@@ -934,6 +737,43 @@ public void updateEntryExceptionTest2() throws 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 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 listEntriesTest() {
@@ -1152,6 +992,46 @@ public void updateTagTemplateExceptionTest2() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTagTemplateTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDataCatalog.addResponse(expectedResponse);
+
+    TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+    boolean force = false;
+
+    client.deleteTagTemplate(name, force);
+
+    List actualRequests = mockDataCatalog.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteTagTemplateRequest actualRequest = (DeleteTagTemplateRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, TagTemplateName.parse(actualRequest.getName()));
+    Assert.assertEquals(force, actualRequest.getForce());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTagTemplateExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDataCatalog.addException(exception);
+
+    try {
+      TagTemplateName name = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]");
+      boolean force = false;
+
+      client.deleteTagTemplate(name, force);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void createTagTemplateFieldTest() {
@@ -1378,6 +1258,49 @@ public void renameTagTemplateFieldExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  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 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 createTagTest() {
@@ -1525,6 +1448,43 @@ public void updateTagExceptionTest2() throws 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 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 listTagsTest() {
@@ -1613,6 +1573,46 @@ public void setIamPolicyExceptionTest() throws 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 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 testIamPermissionsTest() {
diff --git a/synth.metadata b/synth.metadata
index 43502460..c766b7b3 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,23 +4,23 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datacatalog.git",
-        "sha": "f74bfda82ab97f1f2ce7877ac134592c2f50b5a0"
+        "sha": "ea1be408a44aa8ee95705e7daaf580b3e38b9b43"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c1ba5ba3f24307ca5a6df350d0137c29d69983d5",
-        "internalRef": "316715576"
+        "sha": "8f57b478971817195a74d47632dd13a1c409f012",
+        "internalRef": "318312024"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c1ba5ba3f24307ca5a6df350d0137c29d69983d5",
-        "internalRef": "316715576"
+        "sha": "8f57b478971817195a74d47632dd13a1c409f012",
+        "internalRef": "318312024"
       }
     },
     {