From 34cf8d00584d342d843d5f999d586bfc82db4763 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Mon, 30 Aug 2021 16:42:01 -0700
Subject: [PATCH] chore: Re-generated to pick up changes from googleapis (#604)

* chore: release gapic-generator-java v1.0.17

Committer: @miraleung
PiperOrigin-RevId: 388499329

Source-Author: Google APIs <noreply@google.com>
Source-Date: Tue Aug 3 11:12:29 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: bb0a090d9204110042ab5dee2ce9e06e8071ce54
Source-Link: https://github.com/googleapis/googleapis/commit/bb0a090d9204110042ab5dee2ce9e06e8071ce54

* feat!: release gapic-generator-java v2.0.0

Committer: @miraleung
PiperOrigin-RevId: 388535346

Source-Author: Google APIs <noreply@google.com>
Source-Date: Tue Aug 3 13:48:38 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: d9eaf41de44d953458b18712a3f240bb4c564e48
Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48

* chore: release gapic-generator-java v2.0.1

Committer: @miraleung
PiperOrigin-RevId: 389657692

Source-Author: Google APIs <noreply@google.com>
Source-Date: Mon Aug 9 09:53:52 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: a739464cacb3aa6d375683aefe16b79c21da1bb0
Source-Link: https://github.com/googleapis/googleapis/commit/a739464cacb3aa6d375683aefe16b79c21da1bb0

Co-authored-by: Emily Ball <emilyball@google.com>
---
 .../datacatalog/v1/DataCatalogClient.java     |  61 ++--
 .../datacatalog/v1/DataCatalogSettings.java   |   3 +-
 .../v1/PolicyTagManagerClient.java            |  33 +-
 ...PolicyTagManagerSerializationSettings.java |   3 +-
 .../v1/PolicyTagManagerSettings.java          |   3 +-
 .../v1/stub/DataCatalogStubSettings.java      |   3 +-
 .../v1/stub/GrpcDataCatalogStub.java          | 300 +++++++-----------
 ...GrpcPolicyTagManagerSerializationStub.java |  43 ++-
 .../v1/stub/GrpcPolicyTagManagerStub.java     | 153 ++++-----
 ...cyTagManagerSerializationStubSettings.java |   3 +-
 .../v1/stub/PolicyTagManagerStubSettings.java |   3 +-
 .../v1beta1/DataCatalogClient.java            |  61 ++--
 .../v1beta1/DataCatalogSettings.java          |   3 +-
 .../v1beta1/PolicyTagManagerClient.java       |  33 +-
 ...PolicyTagManagerSerializationSettings.java |   3 +-
 .../v1beta1/PolicyTagManagerSettings.java     |   3 +-
 .../v1beta1/stub/DataCatalogStubSettings.java |   3 +-
 .../v1beta1/stub/GrpcDataCatalogStub.java     | 288 +++++++----------
 ...GrpcPolicyTagManagerSerializationStub.java |  32 +-
 .../stub/GrpcPolicyTagManagerStub.java        | 153 ++++-----
 ...cyTagManagerSerializationStubSettings.java |   3 +-
 .../stub/PolicyTagManagerStubSettings.java    |   3 +-
 synth.metadata                                |   8 +-
 23 files changed, 460 insertions(+), 741 deletions(-)

diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
index c38784a8..9c1ed6a6 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datacatalog.v1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -3526,7 +3525,7 @@ public final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable()
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
    * }
@@ -3569,7 +3568,8 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String resource =
+   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
    * }
@@ -3611,7 +3611,8 @@ public final Policy setIamPolicy(String resource, Policy policy) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = dataCatalogClient.setIamPolicy(request);
@@ -3648,7 +3649,8 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = dataCatalogClient.setIamPolicyCallable().futureCall(request);
@@ -3689,7 +3691,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy response = dataCatalogClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -3734,7 +3736,8 @@ public final Policy getIamPolicy(ResourceName resource) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String resource =
+   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
    *   Policy response = dataCatalogClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -3778,7 +3781,8 @@ public final Policy getIamPolicy(String resource) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = dataCatalogClient.getIamPolicy(request);
@@ -3822,7 +3826,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
@@ -3857,7 +3862,8 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = dataCatalogClient.testIamPermissions(request);
@@ -3893,7 +3899,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -3953,12 +3960,7 @@ public static ApiFuture<SearchCatalogPagedResponse> createAsync(
           SearchCatalogPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchCatalogPage, SearchCatalogPagedResponse>() {
-            @Override
-            public SearchCatalogPagedResponse apply(SearchCatalogPage input) {
-              return new SearchCatalogPagedResponse(input);
-            }
-          },
+          input -> new SearchCatalogPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4034,12 +4036,7 @@ public static ApiFuture<ListEntryGroupsPagedResponse> createAsync(
           ListEntryGroupsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListEntryGroupsPage, ListEntryGroupsPagedResponse>() {
-            @Override
-            public ListEntryGroupsPagedResponse apply(ListEntryGroupsPage input) {
-              return new ListEntryGroupsPagedResponse(input);
-            }
-          },
+          input -> new ListEntryGroupsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -4115,14 +4112,7 @@ public static ApiFuture<ListEntriesPagedResponse> createAsync(
       ApiFuture<ListEntriesPage> futurePage =
           ListEntriesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListEntriesPage, ListEntriesPagedResponse>() {
-            @Override
-            public ListEntriesPagedResponse apply(ListEntriesPage input) {
-              return new ListEntriesPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListEntriesPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListEntriesPagedResponse(ListEntriesPage page) {
@@ -4191,14 +4181,7 @@ public static ApiFuture<ListTagsPagedResponse> createAsync(
       ApiFuture<ListTagsPage> futurePage =
           ListTagsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListTagsPage, ListTagsPagedResponse>() {
-            @Override
-            public ListTagsPagedResponse apply(ListTagsPage input) {
-              return new ListTagsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListTagsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListTagsPagedResponse(ListTagsPage page) {
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogSettings.java
index 46c7af68..ab562c2b 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogSettings.java
@@ -311,14 +311,13 @@ public DataCatalogStubSettings.Builder getStubSettingsBuilder() {
       return ((DataCatalogStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
index b9d59891..838ed477 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datacatalog.v1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1209,7 +1208,8 @@ public final UnaryCallable<GetPolicyTagRequest, PolicyTag> getPolicyTagCallable(
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = policyTagManagerClient.getIamPolicy(request);
@@ -1233,7 +1233,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = policyTagManagerClient.getIamPolicyCallable().futureCall(request);
@@ -1256,7 +1257,8 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = policyTagManagerClient.setIamPolicy(request);
@@ -1280,7 +1282,8 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = policyTagManagerClient.setIamPolicyCallable().futureCall(request);
@@ -1303,7 +1306,8 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = policyTagManagerClient.testIamPermissions(request);
@@ -1327,7 +1331,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -1387,12 +1392,7 @@ public static ApiFuture<ListTaxonomiesPagedResponse> createAsync(
           ListTaxonomiesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListTaxonomiesPage, ListTaxonomiesPagedResponse>() {
-            @Override
-            public ListTaxonomiesPagedResponse apply(ListTaxonomiesPage input) {
-              return new ListTaxonomiesPagedResponse(input);
-            }
-          },
+          input -> new ListTaxonomiesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1468,12 +1468,7 @@ public static ApiFuture<ListPolicyTagsPagedResponse> createAsync(
           ListPolicyTagsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPolicyTagsPage, ListPolicyTagsPagedResponse>() {
-            @Override
-            public ListPolicyTagsPagedResponse apply(ListPolicyTagsPage input) {
-              return new ListPolicyTagsPagedResponse(input);
-            }
-          },
+          input -> new ListPolicyTagsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationSettings.java
index fca04d29..79ce51c3 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationSettings.java
@@ -174,14 +174,13 @@ public PolicyTagManagerSerializationStubSettings.Builder getStubSettingsBuilder(
       return ((PolicyTagManagerSerializationStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSettings.java
index 3df9d919..2091bcf3 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSettings.java
@@ -231,14 +231,13 @@ public PolicyTagManagerStubSettings.Builder getStubSettingsBuilder() {
       return ((PolicyTagManagerStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
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 5a7a03cd..c71353f3 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
@@ -1029,14 +1029,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcDataCatalogStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcDataCatalogStub.java
index 453383d2..30d7254b 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcDataCatalogStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcDataCatalogStub.java
@@ -26,7 +26,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1.CreateEntryGroupRequest;
 import com.google.cloud.datacatalog.v1.CreateEntryRequest;
@@ -73,7 +72,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -441,53 +439,40 @@ protected GrpcDataCatalogStub(
         GrpcCallSettings.<CreateEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(createEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupTransportSettings =
         GrpcCallSettings.<GetEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(getEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupTransportSettings =
         GrpcCallSettings.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(updateEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "entry_group.name", String.valueOf(request.getEntryGroup().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("entry_group.name", String.valueOf(request.getEntryGroup().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupTransportSettings =
         GrpcCallSettings.<DeleteEntryGroupRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
@@ -495,65 +480,50 @@ public Map<String, String> extract(DeleteEntryGroupRequest request) {
             GrpcCallSettings.<ListEntryGroupsRequest, ListEntryGroupsResponse>newBuilder()
                 .setMethodDescriptor(listEntryGroupsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListEntryGroupsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListEntryGroupsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<CreateEntryRequest, Entry> createEntryTransportSettings =
         GrpcCallSettings.<CreateEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(createEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateEntryRequest, Entry> updateEntryTransportSettings =
         GrpcCallSettings.<UpdateEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(updateEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("entry.name", String.valueOf(request.getEntry().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("entry.name", String.valueOf(request.getEntry().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteEntryRequest, Empty> deleteEntryTransportSettings =
         GrpcCallSettings.<DeleteEntryRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetEntryRequest, Entry> getEntryTransportSettings =
         GrpcCallSettings.<GetEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(getEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<LookupEntryRequest, Entry> lookupEntryTransportSettings =
@@ -564,66 +534,51 @@ public Map<String, String> extract(GetEntryRequest request) {
         GrpcCallSettings.<ListEntriesRequest, ListEntriesResponse>newBuilder()
             .setMethodDescriptor(listEntriesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListEntriesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListEntriesRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagTemplateRequest, TagTemplate> createTagTemplateTransportSettings =
         GrpcCallSettings.<CreateTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(createTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetTagTemplateRequest, TagTemplate> getTagTemplateTransportSettings =
         GrpcCallSettings.<GetTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(getTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateTransportSettings =
         GrpcCallSettings.<UpdateTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(updateTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "tag_template.name", String.valueOf(request.getTagTemplate().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put(
+                      "tag_template.name", String.valueOf(request.getTagTemplate().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateTransportSettings =
         GrpcCallSettings.<DeleteTagTemplateRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
@@ -631,13 +586,10 @@ public Map<String, String> extract(DeleteTagTemplateRequest request) {
             GrpcCallSettings.<CreateTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(createTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<UpdateTagTemplateFieldRequest, TagTemplateField>
@@ -645,13 +597,10 @@ public Map<String, String> extract(CreateTagTemplateFieldRequest request) {
             GrpcCallSettings.<UpdateTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(updateTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<RenameTagTemplateFieldRequest, TagTemplateField>
@@ -659,13 +608,10 @@ public Map<String, String> extract(UpdateTagTemplateFieldRequest request) {
             GrpcCallSettings.<RenameTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(renameTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RenameTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(RenameTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<RenameTagTemplateFieldEnumValueRequest, TagTemplateField>
@@ -673,105 +619,80 @@ public Map<String, String> extract(RenameTagTemplateFieldRequest request) {
             GrpcCallSettings.<RenameTagTemplateFieldEnumValueRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(renameTagTemplateFieldEnumValueMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RenameTagTemplateFieldEnumValueRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          RenameTagTemplateFieldEnumValueRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldTransportSettings =
         GrpcCallSettings.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateFieldRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateFieldRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagRequest, Tag> createTagTransportSettings =
         GrpcCallSettings.<CreateTagRequest, Tag>newBuilder()
             .setMethodDescriptor(createTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTagRequest, Tag> updateTagTransportSettings =
         GrpcCallSettings.<UpdateTagRequest, Tag>newBuilder()
             .setMethodDescriptor(updateTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("tag.name", String.valueOf(request.getTag().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("tag.name", String.valueOf(request.getTag().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTagRequest, Empty> deleteTagTransportSettings =
         GrpcCallSettings.<DeleteTagRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListTagsRequest, ListTagsResponse> listTagsTransportSettings =
         GrpcCallSettings.<ListTagsRequest, ListTagsResponse>newBuilder()
             .setMethodDescriptor(listTagsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListTagsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListTagsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -779,13 +700,10 @@ public Map<String, String> extract(GetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -1081,7 +999,13 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerSerializationStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerSerializationStub.java
index 77b75cf4..4c198bb6 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerSerializationStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerSerializationStub.java
@@ -21,7 +21,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1.ExportTaxonomiesRequest;
 import com.google.cloud.datacatalog.v1.ExportTaxonomiesResponse;
@@ -34,7 +33,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -138,13 +136,10 @@ protected GrpcPolicyTagManagerSerializationStub(
         GrpcCallSettings.<ReplaceTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(replaceTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ReplaceTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(ReplaceTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ImportTaxonomiesRequest, ImportTaxonomiesResponse>
@@ -152,13 +147,10 @@ public Map<String, String> extract(ReplaceTaxonomyRequest request) {
             GrpcCallSettings.<ImportTaxonomiesRequest, ImportTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(importTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ImportTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ImportTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ExportTaxonomiesRequest, ExportTaxonomiesResponse>
@@ -166,13 +158,10 @@ public Map<String, String> extract(ImportTaxonomiesRequest request) {
             GrpcCallSettings.<ExportTaxonomiesRequest, ExportTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(exportTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ExportTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ExportTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
 
@@ -213,7 +202,13 @@ public UnaryCallable<ReplaceTaxonomyRequest, Taxonomy> replaceTaxonomyCallable()
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerStub.java
index 5ce77a94..a2e6643c 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/GrpcPolicyTagManagerStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1.CreatePolicyTagRequest;
 import com.google.cloud.datacatalog.v1.CreateTaxonomyRequest;
@@ -51,7 +50,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -256,39 +254,30 @@ protected GrpcPolicyTagManagerStub(
         GrpcCallSettings.<CreateTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(createTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTaxonomyRequest, Empty> deleteTaxonomyTransportSettings =
         GrpcCallSettings.<DeleteTaxonomyRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyTransportSettings =
         GrpcCallSettings.<UpdateTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(updateTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("taxonomy.name", String.valueOf(request.getTaxonomy().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("taxonomy.name", String.valueOf(request.getTaxonomy().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListTaxonomiesRequest, ListTaxonomiesResponse>
@@ -296,65 +285,50 @@ public Map<String, String> extract(UpdateTaxonomyRequest request) {
             GrpcCallSettings.<ListTaxonomiesRequest, ListTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(listTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetTaxonomyRequest, Taxonomy> getTaxonomyTransportSettings =
         GrpcCallSettings.<GetTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(getTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreatePolicyTagRequest, PolicyTag> createPolicyTagTransportSettings =
         GrpcCallSettings.<CreatePolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(createPolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreatePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreatePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeletePolicyTagRequest, Empty> deletePolicyTagTransportSettings =
         GrpcCallSettings.<DeletePolicyTagRequest, Empty>newBuilder()
             .setMethodDescriptor(deletePolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeletePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeletePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagTransportSettings =
         GrpcCallSettings.<UpdatePolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(updatePolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdatePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdatePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("policy_tag.name", String.valueOf(request.getPolicyTag().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("policy_tag.name", String.valueOf(request.getPolicyTag().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListPolicyTagsRequest, ListPolicyTagsResponse>
@@ -362,52 +336,40 @@ public Map<String, String> extract(UpdatePolicyTagRequest request) {
             GrpcCallSettings.<ListPolicyTagsRequest, ListPolicyTagsResponse>newBuilder()
                 .setMethodDescriptor(listPolicyTagsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListPolicyTagsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListPolicyTagsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetPolicyTagRequest, PolicyTag> getPolicyTagTransportSettings =
         GrpcCallSettings.<GetPolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(getPolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetPolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetPolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -415,13 +377,10 @@ public Map<String, String> extract(SetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -561,7 +520,13 @@ public UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerSerializationStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerSerializationStubSettings.java
index 79bb101d..3eb48724 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerSerializationStubSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerSerializationStubSettings.java
@@ -287,14 +287,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerStubSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerStubSettings.java
index cac0d3de..1f8cb47f 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerStubSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/PolicyTagManagerStubSettings.java
@@ -599,14 +599,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
index c61b76ab..a7b928d2 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datacatalog.v1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -3248,7 +3247,7 @@ public final UnaryCallable<ListTagsRequest, ListTagsResponse> listTagsCallable()
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
    * }
@@ -3285,7 +3284,8 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String resource =
+   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = dataCatalogClient.setIamPolicy(resource, policy);
    * }
@@ -3321,7 +3321,8 @@ public final Policy setIamPolicy(String resource, Policy policy) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = dataCatalogClient.setIamPolicy(request);
@@ -3352,7 +3353,8 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = dataCatalogClient.setIamPolicyCallable().futureCall(request);
@@ -3383,7 +3385,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
+   *   ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Policy response = dataCatalogClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -3418,7 +3420,8 @@ public final Policy getIamPolicy(ResourceName resource) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String resource =
+   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
    *   Policy response = dataCatalogClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -3452,7 +3455,8 @@ public final Policy getIamPolicy(String resource) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = dataCatalogClient.getIamPolicy(request);
@@ -3486,7 +3490,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = dataCatalogClient.getIamPolicyCallable().futureCall(request);
@@ -3516,7 +3521,8 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = dataCatalogClient.testIamPermissions(request);
@@ -3547,7 +3553,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -3607,12 +3614,7 @@ public static ApiFuture<SearchCatalogPagedResponse> createAsync(
           SearchCatalogPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchCatalogPage, SearchCatalogPagedResponse>() {
-            @Override
-            public SearchCatalogPagedResponse apply(SearchCatalogPage input) {
-              return new SearchCatalogPagedResponse(input);
-            }
-          },
+          input -> new SearchCatalogPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3688,12 +3690,7 @@ public static ApiFuture<ListEntryGroupsPagedResponse> createAsync(
           ListEntryGroupsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListEntryGroupsPage, ListEntryGroupsPagedResponse>() {
-            @Override
-            public ListEntryGroupsPagedResponse apply(ListEntryGroupsPage input) {
-              return new ListEntryGroupsPagedResponse(input);
-            }
-          },
+          input -> new ListEntryGroupsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3769,14 +3766,7 @@ public static ApiFuture<ListEntriesPagedResponse> createAsync(
       ApiFuture<ListEntriesPage> futurePage =
           ListEntriesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListEntriesPage, ListEntriesPagedResponse>() {
-            @Override
-            public ListEntriesPagedResponse apply(ListEntriesPage input) {
-              return new ListEntriesPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListEntriesPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListEntriesPagedResponse(ListEntriesPage page) {
@@ -3845,14 +3835,7 @@ public static ApiFuture<ListTagsPagedResponse> createAsync(
       ApiFuture<ListTagsPage> futurePage =
           ListTagsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListTagsPage, ListTagsPagedResponse>() {
-            @Override
-            public ListTagsPagedResponse apply(ListTagsPage input) {
-              return new ListTagsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListTagsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListTagsPagedResponse(ListTagsPage page) {
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 e73c048b..8271da85 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
@@ -306,14 +306,13 @@ public DataCatalogStubSettings.Builder getStubSettingsBuilder() {
       return ((DataCatalogStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
index adddd8ae..4131823a 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datacatalog.v1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1178,7 +1177,8 @@ public final UnaryCallable<GetPolicyTagRequest, PolicyTag> getPolicyTagCallable(
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = policyTagManagerClient.getIamPolicy(request);
@@ -1202,7 +1202,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = policyTagManagerClient.getIamPolicyCallable().futureCall(request);
@@ -1225,7 +1226,8 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = policyTagManagerClient.setIamPolicy(request);
@@ -1249,7 +1251,8 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = policyTagManagerClient.setIamPolicyCallable().futureCall(request);
@@ -1272,7 +1275,8 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = policyTagManagerClient.testIamPermissions(request);
@@ -1296,7 +1300,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setResource(
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -1356,12 +1361,7 @@ public static ApiFuture<ListTaxonomiesPagedResponse> createAsync(
           ListTaxonomiesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListTaxonomiesPage, ListTaxonomiesPagedResponse>() {
-            @Override
-            public ListTaxonomiesPagedResponse apply(ListTaxonomiesPage input) {
-              return new ListTaxonomiesPagedResponse(input);
-            }
-          },
+          input -> new ListTaxonomiesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1437,12 +1437,7 @@ public static ApiFuture<ListPolicyTagsPagedResponse> createAsync(
           ListPolicyTagsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPolicyTagsPage, ListPolicyTagsPagedResponse>() {
-            @Override
-            public ListPolicyTagsPagedResponse apply(ListPolicyTagsPage input) {
-              return new ListPolicyTagsPagedResponse(input);
-            }
-          },
+          input -> new ListPolicyTagsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationSettings.java
index 1ec55066..420fcf37 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationSettings.java
@@ -169,14 +169,13 @@ public PolicyTagManagerSerializationStubSettings.Builder getStubSettingsBuilder(
       return ((PolicyTagManagerSerializationStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
index 08f9779c..2c2581a4 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSettings.java
@@ -232,14 +232,13 @@ public PolicyTagManagerStubSettings.Builder getStubSettingsBuilder() {
       return ((PolicyTagManagerStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
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 1343e87a..e47db449 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
@@ -1008,14 +1008,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
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 8ed395a8..7da73575 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
@@ -27,7 +27,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1beta1.CreateEntryGroupRequest;
 import com.google.cloud.datacatalog.v1beta1.CreateEntryRequest;
@@ -73,7 +72,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -432,53 +430,40 @@ protected GrpcDataCatalogStub(
         GrpcCallSettings.<CreateEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(createEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateEntryGroupRequest, EntryGroup> updateEntryGroupTransportSettings =
         GrpcCallSettings.<UpdateEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(updateEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "entry_group.name", String.valueOf(request.getEntryGroup().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("entry_group.name", String.valueOf(request.getEntryGroup().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetEntryGroupRequest, EntryGroup> getEntryGroupTransportSettings =
         GrpcCallSettings.<GetEntryGroupRequest, EntryGroup>newBuilder()
             .setMethodDescriptor(getEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteEntryGroupRequest, Empty> deleteEntryGroupTransportSettings =
         GrpcCallSettings.<DeleteEntryGroupRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteEntryGroupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryGroupRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEntryGroupRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListEntryGroupsRequest, ListEntryGroupsResponse>
@@ -486,65 +471,50 @@ public Map<String, String> extract(DeleteEntryGroupRequest request) {
             GrpcCallSettings.<ListEntryGroupsRequest, ListEntryGroupsResponse>newBuilder()
                 .setMethodDescriptor(listEntryGroupsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListEntryGroupsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListEntryGroupsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<CreateEntryRequest, Entry> createEntryTransportSettings =
         GrpcCallSettings.<CreateEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(createEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateEntryRequest, Entry> updateEntryTransportSettings =
         GrpcCallSettings.<UpdateEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(updateEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("entry.name", String.valueOf(request.getEntry().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("entry.name", String.valueOf(request.getEntry().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteEntryRequest, Empty> deleteEntryTransportSettings =
         GrpcCallSettings.<DeleteEntryRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetEntryRequest, Entry> getEntryTransportSettings =
         GrpcCallSettings.<GetEntryRequest, Entry>newBuilder()
             .setMethodDescriptor(getEntryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetEntryRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetEntryRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<LookupEntryRequest, Entry> lookupEntryTransportSettings =
@@ -555,66 +525,51 @@ public Map<String, String> extract(GetEntryRequest request) {
         GrpcCallSettings.<ListEntriesRequest, ListEntriesResponse>newBuilder()
             .setMethodDescriptor(listEntriesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListEntriesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListEntriesRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagTemplateRequest, TagTemplate> createTagTemplateTransportSettings =
         GrpcCallSettings.<CreateTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(createTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetTagTemplateRequest, TagTemplate> getTagTemplateTransportSettings =
         GrpcCallSettings.<GetTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(getTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTagTemplateRequest, TagTemplate> updateTagTemplateTransportSettings =
         GrpcCallSettings.<UpdateTagTemplateRequest, TagTemplate>newBuilder()
             .setMethodDescriptor(updateTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "tag_template.name", String.valueOf(request.getTagTemplate().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put(
+                      "tag_template.name", String.valueOf(request.getTagTemplate().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTagTemplateRequest, Empty> deleteTagTemplateTransportSettings =
         GrpcCallSettings.<DeleteTagTemplateRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagTemplateFieldRequest, TagTemplateField>
@@ -622,13 +577,10 @@ public Map<String, String> extract(DeleteTagTemplateRequest request) {
             GrpcCallSettings.<CreateTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(createTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<UpdateTagTemplateFieldRequest, TagTemplateField>
@@ -636,13 +588,10 @@ public Map<String, String> extract(CreateTagTemplateFieldRequest request) {
             GrpcCallSettings.<UpdateTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(updateTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<RenameTagTemplateFieldRequest, TagTemplateField>
@@ -650,104 +599,80 @@ public Map<String, String> extract(UpdateTagTemplateFieldRequest request) {
             GrpcCallSettings.<RenameTagTemplateFieldRequest, TagTemplateField>newBuilder()
                 .setMethodDescriptor(renameTagTemplateFieldMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RenameTagTemplateFieldRequest>() {
-                      @Override
-                      public Map<String, String> extract(RenameTagTemplateFieldRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DeleteTagTemplateFieldRequest, Empty> deleteTagTemplateFieldTransportSettings =
         GrpcCallSettings.<DeleteTagTemplateFieldRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagTemplateFieldMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagTemplateFieldRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagTemplateFieldRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateTagRequest, Tag> createTagTransportSettings =
         GrpcCallSettings.<CreateTagRequest, Tag>newBuilder()
             .setMethodDescriptor(createTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTagRequest, Tag> updateTagTransportSettings =
         GrpcCallSettings.<UpdateTagRequest, Tag>newBuilder()
             .setMethodDescriptor(updateTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("tag.name", String.valueOf(request.getTag().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("tag.name", String.valueOf(request.getTag().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTagRequest, Empty> deleteTagTransportSettings =
         GrpcCallSettings.<DeleteTagRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListTagsRequest, ListTagsResponse> listTagsTransportSettings =
         GrpcCallSettings.<ListTagsRequest, ListTagsResponse>newBuilder()
             .setMethodDescriptor(listTagsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListTagsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListTagsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -755,13 +680,10 @@ public Map<String, String> extract(GetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -1046,7 +968,13 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerSerializationStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerSerializationStub.java
index 29a2e1c4..c7eff486 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerSerializationStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerSerializationStub.java
@@ -22,7 +22,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1beta1.ExportTaxonomiesRequest;
 import com.google.cloud.datacatalog.v1beta1.ExportTaxonomiesResponse;
@@ -33,7 +32,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -127,13 +125,10 @@ protected GrpcPolicyTagManagerSerializationStub(
             GrpcCallSettings.<ImportTaxonomiesRequest, ImportTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(importTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ImportTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ImportTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ExportTaxonomiesRequest, ExportTaxonomiesResponse>
@@ -141,13 +136,10 @@ public Map<String, String> extract(ImportTaxonomiesRequest request) {
             GrpcCallSettings.<ExportTaxonomiesRequest, ExportTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(exportTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ExportTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ExportTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
 
@@ -180,7 +172,13 @@ public GrpcOperationsStub getOperationsStub() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
index 27c40e79..4f8c6aef 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/stub/GrpcPolicyTagManagerStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.datacatalog.v1beta1.CreatePolicyTagRequest;
 import com.google.cloud.datacatalog.v1beta1.CreateTaxonomyRequest;
@@ -52,7 +51,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -262,39 +260,30 @@ protected GrpcPolicyTagManagerStub(
         GrpcCallSettings.<CreateTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(createTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteTaxonomyRequest, Empty> deleteTaxonomyTransportSettings =
         GrpcCallSettings.<DeleteTaxonomyRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateTaxonomyRequest, Taxonomy> updateTaxonomyTransportSettings =
         GrpcCallSettings.<UpdateTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(updateTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("taxonomy.name", String.valueOf(request.getTaxonomy().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("taxonomy.name", String.valueOf(request.getTaxonomy().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListTaxonomiesRequest, ListTaxonomiesResponse>
@@ -302,65 +291,50 @@ public Map<String, String> extract(UpdateTaxonomyRequest request) {
             GrpcCallSettings.<ListTaxonomiesRequest, ListTaxonomiesResponse>newBuilder()
                 .setMethodDescriptor(listTaxonomiesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListTaxonomiesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListTaxonomiesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetTaxonomyRequest, Taxonomy> getTaxonomyTransportSettings =
         GrpcCallSettings.<GetTaxonomyRequest, Taxonomy>newBuilder()
             .setMethodDescriptor(getTaxonomyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetTaxonomyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetTaxonomyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreatePolicyTagRequest, PolicyTag> createPolicyTagTransportSettings =
         GrpcCallSettings.<CreatePolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(createPolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreatePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreatePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeletePolicyTagRequest, Empty> deletePolicyTagTransportSettings =
         GrpcCallSettings.<DeletePolicyTagRequest, Empty>newBuilder()
             .setMethodDescriptor(deletePolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeletePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeletePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdatePolicyTagRequest, PolicyTag> updatePolicyTagTransportSettings =
         GrpcCallSettings.<UpdatePolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(updatePolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdatePolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdatePolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("policy_tag.name", String.valueOf(request.getPolicyTag().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("policy_tag.name", String.valueOf(request.getPolicyTag().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListPolicyTagsRequest, ListPolicyTagsResponse>
@@ -368,52 +342,40 @@ public Map<String, String> extract(UpdatePolicyTagRequest request) {
             GrpcCallSettings.<ListPolicyTagsRequest, ListPolicyTagsResponse>newBuilder()
                 .setMethodDescriptor(listPolicyTagsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListPolicyTagsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListPolicyTagsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetPolicyTagRequest, PolicyTag> getPolicyTagTransportSettings =
         GrpcCallSettings.<GetPolicyTagRequest, PolicyTag>newBuilder()
             .setMethodDescriptor(getPolicyTagMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetPolicyTagRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetPolicyTagRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -421,13 +383,10 @@ public Map<String, String> extract(SetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -567,7 +526,13 @@ public UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
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 c8d01d38..a08a05f4 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
@@ -262,14 +262,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
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 ede0c10d..d4eace58 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
@@ -592,14 +592,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/synth.metadata b/synth.metadata
index 28976e75..d2e24c61 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,16 +11,16 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "5b1f7cf1d2e2f8ab028a7090d0981fc774028906",
-        "internalRef": "387350333"
+        "sha": "a739464cacb3aa6d375683aefe16b79c21da1bb0",
+        "internalRef": "389657692"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "5b1f7cf1d2e2f8ab028a7090d0981fc774028906",
-        "internalRef": "387350333"
+        "sha": "a739464cacb3aa6d375683aefe16b79c21da1bb0",
+        "internalRef": "389657692"
       }
     },
     {