diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
index 6bb9f718..6ee205d2 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.container.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;
@@ -3583,12 +3582,7 @@ public static ApiFuture<ListUsableSubnetworksPagedResponse> createAsync(
           ListUsableSubnetworksPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListUsableSubnetworksPage, ListUsableSubnetworksPagedResponse>() {
-            @Override
-            public ListUsableSubnetworksPagedResponse apply(ListUsableSubnetworksPage input) {
-              return new ListUsableSubnetworksPagedResponse(input);
-            }
-          },
+          input -> new ListUsableSubnetworksPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
index 0d96ddef..dc265ca5 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
@@ -368,14 +368,13 @@ public ClusterManagerStubSettings.Builder getStubSettingsBuilder() {
       return ((ClusterManagerStubSettings.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-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
index 27f34bce..55b595d0 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
@@ -951,14 +951,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-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
index 7e6031ed..d48e1286 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
@@ -23,7 +23,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.common.collect.ImmutableMap;
 import com.google.container.v1.CancelOperationRequest;
@@ -72,7 +71,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;
 
@@ -486,79 +484,64 @@ protected GrpcClusterManagerStub(
         GrpcCallSettings.<ListClustersRequest, ListClustersResponse>newBuilder()
             .setMethodDescriptor(listClustersMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListClustersRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListClustersRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetClusterRequest, Cluster> getClusterTransportSettings =
         GrpcCallSettings.<GetClusterRequest, Cluster>newBuilder()
             .setMethodDescriptor(getClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateClusterRequest, Operation> createClusterTransportSettings =
         GrpcCallSettings.<CreateClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(createClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateClusterRequest, Operation> updateClusterTransportSettings =
         GrpcCallSettings.<UpdateClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(updateClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateNodePoolRequest, Operation> updateNodePoolTransportSettings =
         GrpcCallSettings.<UpdateNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(updateNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNodePoolAutoscalingRequest, Operation>
@@ -566,129 +549,105 @@ public Map<String, String> extract(UpdateNodePoolRequest request) {
             GrpcCallSettings.<SetNodePoolAutoscalingRequest, Operation>newBuilder()
                 .setMethodDescriptor(setNodePoolAutoscalingMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SetNodePoolAutoscalingRequest>() {
-                      @Override
-                      public Map<String, String> extract(SetNodePoolAutoscalingRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetLoggingServiceRequest, Operation> setLoggingServiceTransportSettings =
         GrpcCallSettings.<SetLoggingServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(setLoggingServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLoggingServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLoggingServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMonitoringServiceRequest, Operation> setMonitoringServiceTransportSettings =
         GrpcCallSettings.<SetMonitoringServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(setMonitoringServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMonitoringServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMonitoringServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetAddonsConfigRequest, Operation> setAddonsConfigTransportSettings =
         GrpcCallSettings.<SetAddonsConfigRequest, Operation>newBuilder()
             .setMethodDescriptor(setAddonsConfigMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetAddonsConfigRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetAddonsConfigRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetLocationsRequest, Operation> setLocationsTransportSettings =
         GrpcCallSettings.<SetLocationsRequest, Operation>newBuilder()
             .setMethodDescriptor(setLocationsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLocationsRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLocationsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateMasterRequest, Operation> updateMasterTransportSettings =
         GrpcCallSettings.<UpdateMasterRequest, Operation>newBuilder()
             .setMethodDescriptor(updateMasterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateMasterRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateMasterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMasterAuthRequest, Operation> setMasterAuthTransportSettings =
         GrpcCallSettings.<SetMasterAuthRequest, Operation>newBuilder()
             .setMethodDescriptor(setMasterAuthMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMasterAuthRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMasterAuthRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteClusterRequest, Operation> deleteClusterTransportSettings =
         GrpcCallSettings.<DeleteClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListOperationsRequest, ListOperationsResponse>
@@ -696,62 +655,50 @@ public Map<String, String> extract(DeleteClusterRequest request) {
             GrpcCallSettings.<ListOperationsRequest, ListOperationsResponse>newBuilder()
                 .setMethodDescriptor(listOperationsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListOperationsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListOperationsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetOperationRequest, Operation> getOperationTransportSettings =
         GrpcCallSettings.<GetOperationRequest, Operation>newBuilder()
             .setMethodDescriptor(getOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetOperationRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetOperationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("operation_id", String.valueOf(request.getOperationId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("operation_id", String.valueOf(request.getOperationId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CancelOperationRequest, Empty> cancelOperationTransportSettings =
         GrpcCallSettings.<CancelOperationRequest, Empty>newBuilder()
             .setMethodDescriptor(cancelOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelOperationRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelOperationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("operation_id", String.valueOf(request.getOperationId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("operation_id", String.valueOf(request.getOperationId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetServerConfigRequest, ServerConfig> getServerConfigTransportSettings =
         GrpcCallSettings.<GetServerConfigRequest, ServerConfig>newBuilder()
             .setMethodDescriptor(getServerConfigMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetServerConfigRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetServerConfigRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetJSONWebKeysRequest, GetJSONWebKeysResponse>
@@ -759,79 +706,64 @@ public Map<String, String> extract(GetServerConfigRequest request) {
             GrpcCallSettings.<GetJSONWebKeysRequest, GetJSONWebKeysResponse>newBuilder()
                 .setMethodDescriptor(getJSONWebKeysMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetJSONWebKeysRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetJSONWebKeysRequest 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<ListNodePoolsRequest, ListNodePoolsResponse> listNodePoolsTransportSettings =
         GrpcCallSettings.<ListNodePoolsRequest, ListNodePoolsResponse>newBuilder()
             .setMethodDescriptor(listNodePoolsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListNodePoolsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListNodePoolsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetNodePoolRequest, NodePool> getNodePoolTransportSettings =
         GrpcCallSettings.<GetNodePoolRequest, NodePool>newBuilder()
             .setMethodDescriptor(getNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateNodePoolRequest, Operation> createNodePoolTransportSettings =
         GrpcCallSettings.<CreateNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(createNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteNodePoolRequest, Operation> deleteNodePoolTransportSettings =
         GrpcCallSettings.<DeleteNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RollbackNodePoolUpgradeRequest, Operation>
@@ -839,17 +771,14 @@ public Map<String, String> extract(DeleteNodePoolRequest request) {
             GrpcCallSettings.<RollbackNodePoolUpgradeRequest, Operation>newBuilder()
                 .setMethodDescriptor(rollbackNodePoolUpgradeMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RollbackNodePoolUpgradeRequest>() {
-                      @Override
-                      public Map<String, String> extract(RollbackNodePoolUpgradeRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetNodePoolManagementRequest, Operation>
@@ -857,130 +786,106 @@ public Map<String, String> extract(RollbackNodePoolUpgradeRequest request) {
             GrpcCallSettings.<SetNodePoolManagementRequest, Operation>newBuilder()
                 .setMethodDescriptor(setNodePoolManagementMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SetNodePoolManagementRequest>() {
-                      @Override
-                      public Map<String, String> extract(SetNodePoolManagementRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetLabelsRequest, Operation> setLabelsTransportSettings =
         GrpcCallSettings.<SetLabelsRequest, Operation>newBuilder()
             .setMethodDescriptor(setLabelsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLabelsRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLabelsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetLegacyAbacRequest, Operation> setLegacyAbacTransportSettings =
         GrpcCallSettings.<SetLegacyAbacRequest, Operation>newBuilder()
             .setMethodDescriptor(setLegacyAbacMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLegacyAbacRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLegacyAbacRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<StartIPRotationRequest, Operation> startIPRotationTransportSettings =
         GrpcCallSettings.<StartIPRotationRequest, Operation>newBuilder()
             .setMethodDescriptor(startIPRotationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StartIPRotationRequest>() {
-                  @Override
-                  public Map<String, String> extract(StartIPRotationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CompleteIPRotationRequest, Operation> completeIPRotationTransportSettings =
         GrpcCallSettings.<CompleteIPRotationRequest, Operation>newBuilder()
             .setMethodDescriptor(completeIPRotationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CompleteIPRotationRequest>() {
-                  @Override
-                  public Map<String, String> extract(CompleteIPRotationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNodePoolSizeRequest, Operation> setNodePoolSizeTransportSettings =
         GrpcCallSettings.<SetNodePoolSizeRequest, Operation>newBuilder()
             .setMethodDescriptor(setNodePoolSizeMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetNodePoolSizeRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetNodePoolSizeRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNetworkPolicyRequest, Operation> setNetworkPolicyTransportSettings =
         GrpcCallSettings.<SetNetworkPolicyRequest, Operation>newBuilder()
             .setMethodDescriptor(setNetworkPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetNetworkPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetNetworkPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMaintenancePolicyRequest, Operation> setMaintenancePolicyTransportSettings =
         GrpcCallSettings.<SetMaintenancePolicyRequest, Operation>newBuilder()
             .setMethodDescriptor(setMaintenancePolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMaintenancePolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMaintenancePolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListUsableSubnetworksRequest, ListUsableSubnetworksResponse>
@@ -989,13 +894,10 @@ public Map<String, String> extract(SetMaintenancePolicyRequest request) {
                 .<ListUsableSubnetworksRequest, ListUsableSubnetworksResponse>newBuilder()
                 .setMethodDescriptor(listUsableSubnetworksMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListUsableSubnetworksRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListUsableSubnetworksRequest 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();
 
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerClient.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerClient.java
index 295a95c9..c15e126b 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerClient.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.container.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;
@@ -3176,12 +3175,7 @@ public static ApiFuture<ListUsableSubnetworksPagedResponse> createAsync(
           ListUsableSubnetworksPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListUsableSubnetworksPage, ListUsableSubnetworksPagedResponse>() {
-            @Override
-            public ListUsableSubnetworksPagedResponse apply(ListUsableSubnetworksPage input) {
-              return new ListUsableSubnetworksPagedResponse(input);
-            }
-          },
+          input -> new ListUsableSubnetworksPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerSettings.java
index 38969126..b9b29aac 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerSettings.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/ClusterManagerSettings.java
@@ -376,14 +376,13 @@ public ClusterManagerStubSettings.Builder getStubSettingsBuilder() {
       return ((ClusterManagerStubSettings.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-container/src/main/java/com/google/cloud/container/v1beta1/stub/ClusterManagerStubSettings.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/ClusterManagerStubSettings.java
index 720cd5a8..62614670 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/ClusterManagerStubSettings.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/ClusterManagerStubSettings.java
@@ -973,14 +973,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-container/src/main/java/com/google/cloud/container/v1beta1/stub/GrpcClusterManagerStub.java b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/GrpcClusterManagerStub.java
index e4f097ea..d9aed28e 100644
--- a/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/GrpcClusterManagerStub.java
+++ b/google-cloud-container/src/main/java/com/google/cloud/container/v1beta1/stub/GrpcClusterManagerStub.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.common.collect.ImmutableMap;
 import com.google.container.v1beta1.CancelOperationRequest;
@@ -75,7 +74,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;
 
@@ -502,79 +500,64 @@ protected GrpcClusterManagerStub(
         GrpcCallSettings.<ListClustersRequest, ListClustersResponse>newBuilder()
             .setMethodDescriptor(listClustersMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListClustersRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListClustersRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetClusterRequest, Cluster> getClusterTransportSettings =
         GrpcCallSettings.<GetClusterRequest, Cluster>newBuilder()
             .setMethodDescriptor(getClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateClusterRequest, Operation> createClusterTransportSettings =
         GrpcCallSettings.<CreateClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(createClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateClusterRequest, Operation> updateClusterTransportSettings =
         GrpcCallSettings.<UpdateClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(updateClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateNodePoolRequest, Operation> updateNodePoolTransportSettings =
         GrpcCallSettings.<UpdateNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(updateNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNodePoolAutoscalingRequest, Operation>
@@ -582,129 +565,105 @@ public Map<String, String> extract(UpdateNodePoolRequest request) {
             GrpcCallSettings.<SetNodePoolAutoscalingRequest, Operation>newBuilder()
                 .setMethodDescriptor(setNodePoolAutoscalingMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SetNodePoolAutoscalingRequest>() {
-                      @Override
-                      public Map<String, String> extract(SetNodePoolAutoscalingRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetLoggingServiceRequest, Operation> setLoggingServiceTransportSettings =
         GrpcCallSettings.<SetLoggingServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(setLoggingServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLoggingServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLoggingServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMonitoringServiceRequest, Operation> setMonitoringServiceTransportSettings =
         GrpcCallSettings.<SetMonitoringServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(setMonitoringServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMonitoringServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMonitoringServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetAddonsConfigRequest, Operation> setAddonsConfigTransportSettings =
         GrpcCallSettings.<SetAddonsConfigRequest, Operation>newBuilder()
             .setMethodDescriptor(setAddonsConfigMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetAddonsConfigRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetAddonsConfigRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetLocationsRequest, Operation> setLocationsTransportSettings =
         GrpcCallSettings.<SetLocationsRequest, Operation>newBuilder()
             .setMethodDescriptor(setLocationsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLocationsRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLocationsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateMasterRequest, Operation> updateMasterTransportSettings =
         GrpcCallSettings.<UpdateMasterRequest, Operation>newBuilder()
             .setMethodDescriptor(updateMasterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateMasterRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateMasterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMasterAuthRequest, Operation> setMasterAuthTransportSettings =
         GrpcCallSettings.<SetMasterAuthRequest, Operation>newBuilder()
             .setMethodDescriptor(setMasterAuthMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMasterAuthRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMasterAuthRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteClusterRequest, Operation> deleteClusterTransportSettings =
         GrpcCallSettings.<DeleteClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListOperationsRequest, ListOperationsResponse>
@@ -712,78 +671,63 @@ public Map<String, String> extract(DeleteClusterRequest request) {
             GrpcCallSettings.<ListOperationsRequest, ListOperationsResponse>newBuilder()
                 .setMethodDescriptor(listOperationsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListOperationsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListOperationsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetOperationRequest, Operation> getOperationTransportSettings =
         GrpcCallSettings.<GetOperationRequest, Operation>newBuilder()
             .setMethodDescriptor(getOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetOperationRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetOperationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("operation_id", String.valueOf(request.getOperationId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("operation_id", String.valueOf(request.getOperationId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CancelOperationRequest, Empty> cancelOperationTransportSettings =
         GrpcCallSettings.<CancelOperationRequest, Empty>newBuilder()
             .setMethodDescriptor(cancelOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelOperationRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelOperationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("operation_id", String.valueOf(request.getOperationId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("operation_id", String.valueOf(request.getOperationId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetServerConfigRequest, ServerConfig> getServerConfigTransportSettings =
         GrpcCallSettings.<GetServerConfigRequest, ServerConfig>newBuilder()
             .setMethodDescriptor(getServerConfigMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetServerConfigRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetServerConfigRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListNodePoolsRequest, ListNodePoolsResponse> listNodePoolsTransportSettings =
         GrpcCallSettings.<ListNodePoolsRequest, ListNodePoolsResponse>newBuilder()
             .setMethodDescriptor(listNodePoolsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListNodePoolsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListNodePoolsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetJSONWebKeysRequest, GetJSONWebKeysResponse>
@@ -791,63 +735,51 @@ public Map<String, String> extract(ListNodePoolsRequest request) {
             GrpcCallSettings.<GetJSONWebKeysRequest, GetJSONWebKeysResponse>newBuilder()
                 .setMethodDescriptor(getJSONWebKeysMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetJSONWebKeysRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetJSONWebKeysRequest 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<GetNodePoolRequest, NodePool> getNodePoolTransportSettings =
         GrpcCallSettings.<GetNodePoolRequest, NodePool>newBuilder()
             .setMethodDescriptor(getNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateNodePoolRequest, Operation> createNodePoolTransportSettings =
         GrpcCallSettings.<CreateNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(createNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("parent", String.valueOf(request.getParent()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("parent", String.valueOf(request.getParent()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteNodePoolRequest, Operation> deleteNodePoolTransportSettings =
         GrpcCallSettings.<DeleteNodePoolRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteNodePoolMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteNodePoolRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteNodePoolRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RollbackNodePoolUpgradeRequest, Operation>
@@ -855,17 +787,14 @@ public Map<String, String> extract(DeleteNodePoolRequest request) {
             GrpcCallSettings.<RollbackNodePoolUpgradeRequest, Operation>newBuilder()
                 .setMethodDescriptor(rollbackNodePoolUpgradeMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<RollbackNodePoolUpgradeRequest>() {
-                      @Override
-                      public Map<String, String> extract(RollbackNodePoolUpgradeRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetNodePoolManagementRequest, Operation>
@@ -873,130 +802,106 @@ public Map<String, String> extract(RollbackNodePoolUpgradeRequest request) {
             GrpcCallSettings.<SetNodePoolManagementRequest, Operation>newBuilder()
                 .setMethodDescriptor(setNodePoolManagementMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SetNodePoolManagementRequest>() {
-                      @Override
-                      public Map<String, String> extract(SetNodePoolManagementRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("cluster_id", String.valueOf(request.getClusterId()));
-                        params.put("name", String.valueOf(request.getName()));
-                        params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                        params.put("project_id", String.valueOf(request.getProjectId()));
-                        params.put("zone", String.valueOf(request.getZone()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("cluster_id", String.valueOf(request.getClusterId()));
+                      params.put("name", String.valueOf(request.getName()));
+                      params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                      params.put("project_id", String.valueOf(request.getProjectId()));
+                      params.put("zone", String.valueOf(request.getZone()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetLabelsRequest, Operation> setLabelsTransportSettings =
         GrpcCallSettings.<SetLabelsRequest, Operation>newBuilder()
             .setMethodDescriptor(setLabelsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLabelsRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLabelsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetLegacyAbacRequest, Operation> setLegacyAbacTransportSettings =
         GrpcCallSettings.<SetLegacyAbacRequest, Operation>newBuilder()
             .setMethodDescriptor(setLegacyAbacMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetLegacyAbacRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetLegacyAbacRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<StartIPRotationRequest, Operation> startIPRotationTransportSettings =
         GrpcCallSettings.<StartIPRotationRequest, Operation>newBuilder()
             .setMethodDescriptor(startIPRotationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StartIPRotationRequest>() {
-                  @Override
-                  public Map<String, String> extract(StartIPRotationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CompleteIPRotationRequest, Operation> completeIPRotationTransportSettings =
         GrpcCallSettings.<CompleteIPRotationRequest, Operation>newBuilder()
             .setMethodDescriptor(completeIPRotationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CompleteIPRotationRequest>() {
-                  @Override
-                  public Map<String, String> extract(CompleteIPRotationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNodePoolSizeRequest, Operation> setNodePoolSizeTransportSettings =
         GrpcCallSettings.<SetNodePoolSizeRequest, Operation>newBuilder()
             .setMethodDescriptor(setNodePoolSizeMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetNodePoolSizeRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetNodePoolSizeRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("node_pool_id", String.valueOf(request.getNodePoolId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetNetworkPolicyRequest, Operation> setNetworkPolicyTransportSettings =
         GrpcCallSettings.<SetNetworkPolicyRequest, Operation>newBuilder()
             .setMethodDescriptor(setNetworkPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetNetworkPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetNetworkPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SetMaintenancePolicyRequest, Operation> setMaintenancePolicyTransportSettings =
         GrpcCallSettings.<SetMaintenancePolicyRequest, Operation>newBuilder()
             .setMethodDescriptor(setMaintenancePolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetMaintenancePolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetMaintenancePolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_id", String.valueOf(request.getClusterId()));
-                    params.put("name", String.valueOf(request.getName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("zone", String.valueOf(request.getZone()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_id", String.valueOf(request.getClusterId()));
+                  params.put("name", String.valueOf(request.getName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("zone", String.valueOf(request.getZone()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListUsableSubnetworksRequest, ListUsableSubnetworksResponse>
@@ -1005,26 +910,20 @@ public Map<String, String> extract(SetMaintenancePolicyRequest request) {
                 .<ListUsableSubnetworksRequest, ListUsableSubnetworksResponse>newBuilder()
                 .setMethodDescriptor(listUsableSubnetworksMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListUsableSubnetworksRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListUsableSubnetworksRequest 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<ListLocationsRequest, ListLocationsResponse> listLocationsTransportSettings =
         GrpcCallSettings.<ListLocationsRequest, ListLocationsResponse>newBuilder()
             .setMethodDescriptor(listLocationsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListLocationsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListLocationsRequest 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();
 
diff --git a/proto-google-cloud-container-v1/clirr-ignored-differences.xml b/proto-google-cloud-container-v1/clirr-ignored-differences.xml
index 53518c89..f2da9a6f 100644
--- a/proto-google-cloud-container-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-container-v1/clirr-ignored-differences.xml
@@ -16,4 +16,5 @@
     <className>com/google/container/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  
 </differences>
diff --git a/proto-google-cloud-container-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-container-v1beta1/clirr-ignored-differences.xml
index 9fd32800..83252f8f 100644
--- a/proto-google-cloud-container-v1beta1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-container-v1beta1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/container/v1beta1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/container/v1beta1/TopicName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml
index c3484028..45620884 100644
--- a/proto-google-cloud-container-v1beta1/pom.xml
+++ b/proto-google-cloud-container-v1beta1/pom.xml
@@ -21,14 +21,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api</groupId>
-      <artifactId>api-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/proto-google-cloud-container-v1beta1/src/main/java/com/google/container/v1beta1/TopicName.java b/proto-google-cloud-container-v1beta1/src/main/java/com/google/container/v1beta1/TopicName.java
deleted file mode 100644
index 34d1f71f..00000000
--- a/proto-google-cloud-container-v1beta1/src/main/java/com/google/container/v1beta1/TopicName.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.container.v1beta1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class TopicName implements ResourceName {
-  private static final PathTemplate PROJECT_TOPIC =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/topics/{topic}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String topic;
-
-  @Deprecated
-  protected TopicName() {
-    project = null;
-    topic = null;
-  }
-
-  private TopicName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    topic = Preconditions.checkNotNull(builder.getTopic());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getTopic() {
-    return topic;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static TopicName of(String project, String topic) {
-    return newBuilder().setProject(project).setTopic(topic).build();
-  }
-
-  public static String format(String project, String topic) {
-    return newBuilder().setProject(project).setTopic(topic).build().toString();
-  }
-
-  public static TopicName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_TOPIC.validatedMatch(
-            formattedString, "TopicName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("topic"));
-  }
-
-  public static List<TopicName> parseList(List<String> formattedStrings) {
-    List<TopicName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<TopicName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (TopicName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_TOPIC.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (topic != null) {
-            fieldMapBuilder.put("topic", topic);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_TOPIC.instantiate("project", project, "topic", topic);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      TopicName that = ((TopicName) o);
-      return Objects.equals(this.project, that.project) && Objects.equals(this.topic, that.topic);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(topic);
-    return h;
-  }
-
-  /** Builder for projects/{project}/topics/{topic}. */
-  public static class Builder {
-    private String project;
-    private String topic;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getTopic() {
-      return topic;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setTopic(String topic) {
-      this.topic = topic;
-      return this;
-    }
-
-    private Builder(TopicName topicName) {
-      this.project = topicName.project;
-      this.topic = topicName.topic;
-    }
-
-    public TopicName build() {
-      return new TopicName(this);
-    }
-  }
-}