diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceClient.java
index d452ebaf..d242371d 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.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;
@@ -944,12 +943,7 @@ public static ApiFuture<ListAutoscalingPoliciesPagedResponse> createAsync(
           ListAutoscalingPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListAutoscalingPoliciesPage, ListAutoscalingPoliciesPagedResponse>() {
-            @Override
-            public ListAutoscalingPoliciesPagedResponse apply(ListAutoscalingPoliciesPage input) {
-              return new ListAutoscalingPoliciesPagedResponse(input);
-            }
-          },
+          input -> new ListAutoscalingPoliciesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java
index aba49662..28bc9d98 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java
@@ -196,14 +196,13 @@ public AutoscalingPolicyServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AutoscalingPolicyServiceStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
index 87cb4c5f..51f40c03 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.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;
@@ -1163,12 +1162,7 @@ public static ApiFuture<ListClustersPagedResponse> createAsync(
           ListClustersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListClustersPage, ListClustersPagedResponse>() {
-            @Override
-            public ListClustersPagedResponse apply(ListClustersPage input) {
-              return new ListClustersPagedResponse(input);
-            }
-          },
+          input -> new ListClustersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
index 27f7760d..b608594b 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
@@ -235,14 +235,13 @@ public ClusterControllerStubSettings.Builder getStubSettingsBuilder() {
       return ((ClusterControllerStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
index 5fc45b92..d052c400 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.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;
@@ -852,14 +851,7 @@ public static ApiFuture<ListJobsPagedResponse> createAsync(
       ApiFuture<ListJobsPage> futurePage =
           ListJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListJobsPage, ListJobsPagedResponse>() {
-            @Override
-            public ListJobsPagedResponse apply(ListJobsPage input) {
-              return new ListJobsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListJobsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListJobsPagedResponse(ListJobsPage page) {
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
index c16d3caa..4a443d10 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
@@ -198,14 +198,13 @@ public JobControllerStubSettings.Builder getStubSettingsBuilder() {
       return ((JobControllerStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClient.java
index 71b74c57..42fc846c 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.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;
@@ -1679,12 +1678,7 @@ public static ApiFuture<ListWorkflowTemplatesPagedResponse> createAsync(
           ListWorkflowTemplatesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListWorkflowTemplatesPage, ListWorkflowTemplatesPagedResponse>() {
-            @Override
-            public ListWorkflowTemplatesPagedResponse apply(ListWorkflowTemplatesPage input) {
-              return new ListWorkflowTemplatesPagedResponse(input);
-            }
-          },
+          input -> new ListWorkflowTemplatesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java
index a964f1e5..9502edcb 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java
@@ -224,14 +224,13 @@ public WorkflowTemplateServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((WorkflowTemplateServiceStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java
index 74ebe987..22099087 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java
@@ -441,14 +441,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-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
index 92b6f431..3784a683 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
@@ -700,14 +700,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-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcAutoscalingPolicyServiceStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcAutoscalingPolicyServiceStub.java
index 240a5a98..89dd2c65 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcAutoscalingPolicyServiceStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcAutoscalingPolicyServiceStub.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.cloud.dataproc.v1.AutoscalingPolicy;
 import com.google.cloud.dataproc.v1.CreateAutoscalingPolicyRequest;
@@ -38,7 +37,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;
 
@@ -171,13 +169,10 @@ protected GrpcAutoscalingPolicyServiceStub(
             GrpcCallSettings.<CreateAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(createAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateAutoscalingPolicyRequest 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<UpdateAutoscalingPolicyRequest, AutoscalingPolicy>
@@ -185,13 +180,10 @@ public Map<String, String> extract(CreateAutoscalingPolicyRequest request) {
             GrpcCallSettings.<UpdateAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(updateAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("policy.name", String.valueOf(request.getPolicy().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("policy.name", String.valueOf(request.getPolicy().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetAutoscalingPolicyRequest, AutoscalingPolicy>
@@ -199,13 +191,10 @@ public Map<String, String> extract(UpdateAutoscalingPolicyRequest request) {
             GrpcCallSettings.<GetAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(getAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListAutoscalingPoliciesRequest, ListAutoscalingPoliciesResponse>
@@ -214,13 +203,10 @@ public Map<String, String> extract(GetAutoscalingPolicyRequest request) {
                 .<ListAutoscalingPoliciesRequest, ListAutoscalingPoliciesResponse>newBuilder()
                 .setMethodDescriptor(listAutoscalingPoliciesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListAutoscalingPoliciesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListAutoscalingPoliciesRequest 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<DeleteAutoscalingPolicyRequest, Empty>
@@ -228,13 +214,10 @@ public Map<String, String> extract(ListAutoscalingPoliciesRequest request) {
             GrpcCallSettings.<DeleteAutoscalingPolicyRequest, Empty>newBuilder()
                 .setMethodDescriptor(deleteAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeleteAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(DeleteAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
index 3843f55c..7b9fb4cb 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1.Cluster;
 import com.google.cloud.dataproc.v1.ClusterOperationMetadata;
@@ -45,7 +44,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;
 
@@ -204,118 +202,94 @@ protected GrpcClusterControllerStub(
         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("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<StopClusterRequest, Operation> stopClusterTransportSettings =
         GrpcCallSettings.<StopClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(stopClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StopClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(StopClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<StartClusterRequest, Operation> startClusterTransportSettings =
         GrpcCallSettings.<StartClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(startClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<StartClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(StartClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListClustersRequest, ListClustersResponse> listClustersTransportSettings =
         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("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DiagnoseClusterRequest, Operation> diagnoseClusterTransportSettings =
         GrpcCallSettings.<DiagnoseClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(diagnoseClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DiagnoseClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(DiagnoseClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
index d842058a..4eb3b09f 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1.CancelJobRequest;
 import com.google.cloud.dataproc.v1.DeleteJobRequest;
@@ -42,7 +41,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;
 
@@ -169,102 +167,81 @@ protected GrpcJobControllerStub(
         GrpcCallSettings.<SubmitJobRequest, Job>newBuilder()
             .setMethodDescriptor(submitJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SubmitJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(SubmitJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SubmitJobRequest, Operation> submitJobAsOperationTransportSettings =
         GrpcCallSettings.<SubmitJobRequest, Operation>newBuilder()
             .setMethodDescriptor(submitJobAsOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SubmitJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(SubmitJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetJobRequest, Job> getJobTransportSettings =
         GrpcCallSettings.<GetJobRequest, Job>newBuilder()
             .setMethodDescriptor(getJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListJobsRequest, ListJobsResponse> listJobsTransportSettings =
         GrpcCallSettings.<ListJobsRequest, ListJobsResponse>newBuilder()
             .setMethodDescriptor(listJobsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListJobsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListJobsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateJobRequest, Job> updateJobTransportSettings =
         GrpcCallSettings.<UpdateJobRequest, Job>newBuilder()
             .setMethodDescriptor(updateJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CancelJobRequest, Job> cancelJobTransportSettings =
         GrpcCallSettings.<CancelJobRequest, Job>newBuilder()
             .setMethodDescriptor(cancelJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteJobRequest, Empty> deleteJobTransportSettings =
         GrpcCallSettings.<DeleteJobRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcWorkflowTemplateServiceStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcWorkflowTemplateServiceStub.java
index ad146643..405a7863 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcWorkflowTemplateServiceStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcWorkflowTemplateServiceStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1.CreateWorkflowTemplateRequest;
 import com.google.cloud.dataproc.v1.DeleteWorkflowTemplateRequest;
@@ -43,7 +42,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;
 
@@ -204,13 +202,10 @@ protected GrpcWorkflowTemplateServiceStub(
             GrpcCallSettings.<CreateWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(createWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateWorkflowTemplateRequest 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<GetWorkflowTemplateRequest, WorkflowTemplate>
@@ -218,13 +213,10 @@ public Map<String, String> extract(CreateWorkflowTemplateRequest request) {
             GrpcCallSettings.<GetWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(getWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<InstantiateWorkflowTemplateRequest, Operation>
@@ -232,14 +224,10 @@ public Map<String, String> extract(GetWorkflowTemplateRequest request) {
             GrpcCallSettings.<InstantiateWorkflowTemplateRequest, Operation>newBuilder()
                 .setMethodDescriptor(instantiateWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<InstantiateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          InstantiateWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<InstantiateInlineWorkflowTemplateRequest, Operation>
@@ -247,14 +235,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<InstantiateInlineWorkflowTemplateRequest, Operation>newBuilder()
                 .setMethodDescriptor(instantiateInlineWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<InstantiateInlineWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          InstantiateInlineWorkflowTemplateRequest 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<UpdateWorkflowTemplateRequest, WorkflowTemplate>
@@ -262,14 +246,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<UpdateWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(updateWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "template.name", String.valueOf(request.getTemplate().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("template.name", String.valueOf(request.getTemplate().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListWorkflowTemplatesRequest, ListWorkflowTemplatesResponse>
@@ -278,26 +258,20 @@ public Map<String, String> extract(UpdateWorkflowTemplateRequest request) {
                 .<ListWorkflowTemplatesRequest, ListWorkflowTemplatesResponse>newBuilder()
                 .setMethodDescriptor(listWorkflowTemplatesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListWorkflowTemplatesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListWorkflowTemplatesRequest 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<DeleteWorkflowTemplateRequest, Empty> deleteWorkflowTemplateTransportSettings =
         GrpcCallSettings.<DeleteWorkflowTemplateRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteWorkflowTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteWorkflowTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteWorkflowTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
index 7dbac111..89eb6870 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
@@ -482,14 +482,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-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
index 68fefe73..05a433b8 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
@@ -574,14 +574,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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceClient.java
index 7d2319ca..60d39599 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.v1beta2;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -946,12 +945,7 @@ public static ApiFuture<ListAutoscalingPoliciesPagedResponse> createAsync(
           ListAutoscalingPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListAutoscalingPoliciesPage, ListAutoscalingPoliciesPagedResponse>() {
-            @Override
-            public ListAutoscalingPoliciesPagedResponse apply(ListAutoscalingPoliciesPage input) {
-              return new ListAutoscalingPoliciesPagedResponse(input);
-            }
-          },
+          input -> new ListAutoscalingPoliciesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java
index 9f5756f5..4a416299 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java
@@ -197,14 +197,13 @@ public AutoscalingPolicyServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AutoscalingPolicyServiceStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClient.java
index 2bd8e1df..39f3b627 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.v1beta2;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -174,8 +173,7 @@ public final OperationsClient getOperationsClient() {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -209,8 +207,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> createClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -238,8 +235,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> createClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -267,8 +263,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> createClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -295,8 +290,7 @@ public final UnaryCallable<CreateClusterRequest, Operation> createClusterCallabl
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Updates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -362,8 +356,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> updateClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Updates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -394,8 +387,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> updateClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Updates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -426,8 +418,7 @@ public final OperationFuture<Cluster, ClusterOperationMetadata> updateClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Updates a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -457,8 +448,7 @@ public final UnaryCallable<UpdateClusterRequest, Operation> updateClusterCallabl
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Deletes a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -491,8 +481,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> deleteClusterAsync
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Deletes a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -521,8 +510,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> deleteClusterAsync
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Deletes a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -551,8 +539,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> deleteClusterAsync
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Deletes a cluster in a project. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    *
    * <p>Sample code:
    *
@@ -830,8 +817,7 @@ public final UnaryCallable<ListClustersRequest, ListClustersResponse> listCluste
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Gets cluster diagnostic information. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    * After the operation completes, [Operation.response][google.longrunning.Operation.response]
    * contains [Empty][google.protobuf.Empty].
    *
@@ -866,8 +852,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> diagnoseClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Gets cluster diagnostic information. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    * After the operation completes, [Operation.response][google.longrunning.Operation.response]
    * contains [Empty][google.protobuf.Empty].
    *
@@ -896,8 +881,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> diagnoseClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Gets cluster diagnostic information. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    * After the operation completes, [Operation.response][google.longrunning.Operation.response]
    * contains [Empty][google.protobuf.Empty].
    *
@@ -926,8 +910,7 @@ public final OperationFuture<Empty, ClusterOperationMetadata> diagnoseClusterAsy
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Gets cluster diagnostic information. The returned
-   * [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+   * [Operation.metadata][google.longrunning.Operation.metadata] will be ClusterOperationMetadata.
    * After the operation completes, [Operation.response][google.longrunning.Operation.response]
    * contains [Empty][google.protobuf.Empty].
    *
@@ -997,12 +980,7 @@ public static ApiFuture<ListClustersPagedResponse> createAsync(
           ListClustersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListClustersPage, ListClustersPagedResponse>() {
-            @Override
-            public ListClustersPagedResponse apply(ListClustersPage input) {
-              return new ListClustersPagedResponse(input);
-            }
-          },
+          input -> new ListClustersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java
index eafa8bc3..da2fdc1f 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java
@@ -213,14 +213,13 @@ public ClusterControllerStubSettings.Builder getStubSettingsBuilder() {
       return ((ClusterControllerStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerClient.java
index 431d774c..a29b868e 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.v1beta2;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -646,9 +645,7 @@ public final UnaryCallable<UpdateJobRequest, Job> updateJobCallable() {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Starts a job cancellation request. To access the job resource after cancellation, call
-   * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
-   * or
-   * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+   * regions/{region}/jobs.list or regions/{region}/jobs.get.
    *
    * <p>Sample code:
    *
@@ -679,9 +676,7 @@ public final Job cancelJob(String projectId, String region, String jobId) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Starts a job cancellation request. To access the job resource after cancellation, call
-   * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
-   * or
-   * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+   * regions/{region}/jobs.list or regions/{region}/jobs.get.
    *
    * <p>Sample code:
    *
@@ -707,9 +702,7 @@ public final Job cancelJob(CancelJobRequest request) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Starts a job cancellation request. To access the job resource after cancellation, call
-   * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
-   * or
-   * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+   * regions/{region}/jobs.list or regions/{region}/jobs.get.
    *
    * <p>Sample code:
    *
@@ -853,14 +846,7 @@ public static ApiFuture<ListJobsPagedResponse> createAsync(
       ApiFuture<ListJobsPage> futurePage =
           ListJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListJobsPage, ListJobsPagedResponse>() {
-            @Override
-            public ListJobsPagedResponse apply(ListJobsPage input) {
-              return new ListJobsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListJobsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListJobsPagedResponse(ListJobsPage page) {
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java
index f700dd21..bdccc85c 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java
@@ -199,14 +199,13 @@ public JobControllerStubSettings.Builder getStubSettingsBuilder() {
       return ((JobControllerStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClient.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClient.java
index d3e10497..ee09725a 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClient.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dataproc.v1beta2;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -502,8 +501,7 @@ public final WorkflowTemplate getWorkflowTemplate(GetWorkflowTemplateRequest req
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -558,8 +556,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -613,8 +610,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -673,8 +669,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -734,8 +729,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -782,8 +776,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -832,8 +825,7 @@ public final OperationFuture<Empty, WorkflowMetadata> instantiateWorkflowTemplat
    * [operations.cancel][google.longrunning.Operations.CancelOperation]. This will cause any
    * inflight jobs to be cancelled and workflow-owned clusters to be deleted.
    *
-   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be
-   * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+   * <p>The [Operation.metadata][google.longrunning.Operation.metadata] will be WorkflowMetadata.
    * Also see [Using
    * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
    *
@@ -1686,12 +1678,7 @@ public static ApiFuture<ListWorkflowTemplatesPagedResponse> createAsync(
           ListWorkflowTemplatesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListWorkflowTemplatesPage, ListWorkflowTemplatesPagedResponse>() {
-            @Override
-            public ListWorkflowTemplatesPagedResponse apply(ListWorkflowTemplatesPage input) {
-              return new ListWorkflowTemplatesPagedResponse(input);
-            }
-          },
+          input -> new ListWorkflowTemplatesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java
index fbf23573..1c23be0d 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java
@@ -225,14 +225,13 @@ public WorkflowTemplateServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((WorkflowTemplateServiceStubSettings.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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java
index 695ef6a3..d0ddcff7 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java
@@ -442,14 +442,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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
index a7c6a9fd..c7e2d7e1 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java
@@ -584,14 +584,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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcAutoscalingPolicyServiceStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcAutoscalingPolicyServiceStub.java
index 7ff00b5b..013c5c3a 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcAutoscalingPolicyServiceStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcAutoscalingPolicyServiceStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1beta2.AutoscalingPolicy;
 import com.google.cloud.dataproc.v1beta2.CreateAutoscalingPolicyRequest;
@@ -39,7 +38,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;
 
@@ -173,13 +171,10 @@ protected GrpcAutoscalingPolicyServiceStub(
             GrpcCallSettings.<CreateAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(createAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateAutoscalingPolicyRequest 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<UpdateAutoscalingPolicyRequest, AutoscalingPolicy>
@@ -187,13 +182,10 @@ public Map<String, String> extract(CreateAutoscalingPolicyRequest request) {
             GrpcCallSettings.<UpdateAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(updateAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("policy.name", String.valueOf(request.getPolicy().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("policy.name", String.valueOf(request.getPolicy().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetAutoscalingPolicyRequest, AutoscalingPolicy>
@@ -201,13 +193,10 @@ public Map<String, String> extract(UpdateAutoscalingPolicyRequest request) {
             GrpcCallSettings.<GetAutoscalingPolicyRequest, AutoscalingPolicy>newBuilder()
                 .setMethodDescriptor(getAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListAutoscalingPoliciesRequest, ListAutoscalingPoliciesResponse>
@@ -216,13 +205,10 @@ public Map<String, String> extract(GetAutoscalingPolicyRequest request) {
                 .<ListAutoscalingPoliciesRequest, ListAutoscalingPoliciesResponse>newBuilder()
                 .setMethodDescriptor(listAutoscalingPoliciesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListAutoscalingPoliciesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListAutoscalingPoliciesRequest 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<DeleteAutoscalingPolicyRequest, Empty>
@@ -230,13 +216,10 @@ public Map<String, String> extract(ListAutoscalingPoliciesRequest request) {
             GrpcCallSettings.<DeleteAutoscalingPolicyRequest, Empty>newBuilder()
                 .setMethodDescriptor(deleteAutoscalingPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeleteAutoscalingPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(DeleteAutoscalingPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcClusterControllerStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcClusterControllerStub.java
index ba22f84d..9346f9f8 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcClusterControllerStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcClusterControllerStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1beta2.Cluster;
 import com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata;
@@ -43,7 +42,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;
 
@@ -179,88 +177,70 @@ protected GrpcClusterControllerStub(
         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("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  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_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListClustersRequest, ListClustersResponse> listClustersTransportSettings =
         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("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DiagnoseClusterRequest, Operation> diagnoseClusterTransportSettings =
         GrpcCallSettings.<DiagnoseClusterRequest, Operation>newBuilder()
             .setMethodDescriptor(diagnoseClusterMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DiagnoseClusterRequest>() {
-                  @Override
-                  public Map<String, String> extract(DiagnoseClusterRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("cluster_name", String.valueOf(request.getClusterName()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("cluster_name", String.valueOf(request.getClusterName()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcJobControllerStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcJobControllerStub.java
index 5bc7d4bf..319573f1 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcJobControllerStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcJobControllerStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1beta2.CancelJobRequest;
 import com.google.cloud.dataproc.v1beta2.DeleteJobRequest;
@@ -43,7 +42,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;
 
@@ -171,102 +169,81 @@ protected GrpcJobControllerStub(
         GrpcCallSettings.<SubmitJobRequest, Job>newBuilder()
             .setMethodDescriptor(submitJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SubmitJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(SubmitJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<SubmitJobRequest, Operation> submitJobAsOperationTransportSettings =
         GrpcCallSettings.<SubmitJobRequest, Operation>newBuilder()
             .setMethodDescriptor(submitJobAsOperationMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SubmitJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(SubmitJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetJobRequest, Job> getJobTransportSettings =
         GrpcCallSettings.<GetJobRequest, Job>newBuilder()
             .setMethodDescriptor(getJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListJobsRequest, ListJobsResponse> listJobsTransportSettings =
         GrpcCallSettings.<ListJobsRequest, ListJobsResponse>newBuilder()
             .setMethodDescriptor(listJobsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListJobsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListJobsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateJobRequest, Job> updateJobTransportSettings =
         GrpcCallSettings.<UpdateJobRequest, Job>newBuilder()
             .setMethodDescriptor(updateJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CancelJobRequest, Job> cancelJobTransportSettings =
         GrpcCallSettings.<CancelJobRequest, Job>newBuilder()
             .setMethodDescriptor(cancelJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteJobRequest, Empty> deleteJobTransportSettings =
         GrpcCallSettings.<DeleteJobRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("job_id", String.valueOf(request.getJobId()));
-                    params.put("project_id", String.valueOf(request.getProjectId()));
-                    params.put("region", String.valueOf(request.getRegion()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("job_id", String.valueOf(request.getJobId()));
+                  params.put("project_id", String.valueOf(request.getProjectId()));
+                  params.put("region", String.valueOf(request.getRegion()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcWorkflowTemplateServiceStub.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcWorkflowTemplateServiceStub.java
index 1a6167f2..d019b4d1 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcWorkflowTemplateServiceStub.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/GrpcWorkflowTemplateServiceStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest;
 import com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest;
@@ -44,7 +43,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;
 
@@ -206,13 +204,10 @@ protected GrpcWorkflowTemplateServiceStub(
             GrpcCallSettings.<CreateWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(createWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateWorkflowTemplateRequest 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<GetWorkflowTemplateRequest, WorkflowTemplate>
@@ -220,13 +215,10 @@ public Map<String, String> extract(CreateWorkflowTemplateRequest request) {
             GrpcCallSettings.<GetWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(getWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<InstantiateWorkflowTemplateRequest, Operation>
@@ -234,14 +226,10 @@ public Map<String, String> extract(GetWorkflowTemplateRequest request) {
             GrpcCallSettings.<InstantiateWorkflowTemplateRequest, Operation>newBuilder()
                 .setMethodDescriptor(instantiateWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<InstantiateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          InstantiateWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<InstantiateInlineWorkflowTemplateRequest, Operation>
@@ -249,14 +237,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<InstantiateInlineWorkflowTemplateRequest, Operation>newBuilder()
                 .setMethodDescriptor(instantiateInlineWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<InstantiateInlineWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          InstantiateInlineWorkflowTemplateRequest 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<UpdateWorkflowTemplateRequest, WorkflowTemplate>
@@ -264,14 +248,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<UpdateWorkflowTemplateRequest, WorkflowTemplate>newBuilder()
                 .setMethodDescriptor(updateWorkflowTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateWorkflowTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateWorkflowTemplateRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "template.name", String.valueOf(request.getTemplate().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("template.name", String.valueOf(request.getTemplate().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ListWorkflowTemplatesRequest, ListWorkflowTemplatesResponse>
@@ -280,26 +260,20 @@ public Map<String, String> extract(UpdateWorkflowTemplateRequest request) {
                 .<ListWorkflowTemplatesRequest, ListWorkflowTemplatesResponse>newBuilder()
                 .setMethodDescriptor(listWorkflowTemplatesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListWorkflowTemplatesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListWorkflowTemplatesRequest 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<DeleteWorkflowTemplateRequest, Empty> deleteWorkflowTemplateTransportSettings =
         GrpcCallSettings.<DeleteWorkflowTemplateRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteWorkflowTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteWorkflowTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteWorkflowTemplateRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
index 0a4b83d5..4fa4e3fd 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java
@@ -483,14 +483,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-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
index b3bffdd8..de284cdf 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java
@@ -575,14 +575,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/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerGrpc.java b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerGrpc.java
index c8e559a1..5a4c86a1 100644
--- a/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerGrpc.java
+++ b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerGrpc.java
@@ -363,7 +363,7 @@ public abstract static class ClusterControllerImplBase implements io.grpc.Bindab
      * <pre>
      * Creates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void createCluster(
@@ -379,7 +379,7 @@ public void createCluster(
      * <pre>
      * Updates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void updateCluster(
@@ -395,7 +395,7 @@ public void updateCluster(
      * <pre>
      * Deletes a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void deleteCluster(
@@ -439,7 +439,7 @@ public void listClusters(
      * <pre>
      * Gets cluster diagnostic information. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * After the operation completes,
      * [Operation.response][google.longrunning.Operation.response]
      * contains
@@ -523,7 +523,7 @@ protected ClusterControllerStub build(
      * <pre>
      * Creates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void createCluster(
@@ -541,7 +541,7 @@ public void createCluster(
      * <pre>
      * Updates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void updateCluster(
@@ -559,7 +559,7 @@ public void updateCluster(
      * <pre>
      * Deletes a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public void deleteCluster(
@@ -608,7 +608,7 @@ public void listClusters(
      * <pre>
      * Gets cluster diagnostic information. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * After the operation completes,
      * [Operation.response][google.longrunning.Operation.response]
      * contains
@@ -652,7 +652,7 @@ protected ClusterControllerBlockingStub build(
      * <pre>
      * Creates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.longrunning.Operation createCluster(
@@ -667,7 +667,7 @@ public com.google.longrunning.Operation createCluster(
      * <pre>
      * Updates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.longrunning.Operation updateCluster(
@@ -682,7 +682,7 @@ public com.google.longrunning.Operation updateCluster(
      * <pre>
      * Deletes a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.longrunning.Operation deleteCluster(
@@ -723,7 +723,7 @@ public com.google.cloud.dataproc.v1beta2.ListClustersResponse listClusters(
      * <pre>
      * Gets cluster diagnostic information. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * After the operation completes,
      * [Operation.response][google.longrunning.Operation.response]
      * contains
@@ -763,7 +763,7 @@ protected ClusterControllerFutureStub build(
      * <pre>
      * Creates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -778,7 +778,7 @@ protected ClusterControllerFutureStub build(
      * <pre>
      * Updates a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -793,7 +793,7 @@ protected ClusterControllerFutureStub build(
      * <pre>
      * Deletes a cluster in a project. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -836,7 +836,7 @@ protected ClusterControllerFutureStub build(
      * <pre>
      * Gets cluster diagnostic information. The returned
      * [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+     * ClusterOperationMetadata.
      * After the operation completes,
      * [Operation.response][google.longrunning.Operation.response]
      * contains
diff --git a/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerGrpc.java b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerGrpc.java
index e252d9de..6f555c3a 100644
--- a/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerGrpc.java
+++ b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerGrpc.java
@@ -460,9 +460,9 @@ public void updateJob(
      * <pre>
      * Starts a job cancellation request. To access the job resource
      * after cancellation, call
-     * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
+     * regions/{region}/jobs.list
      * or
-     * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+     * regions/{region}/jobs.get.
      * </pre>
      */
     public void cancelJob(
@@ -632,9 +632,9 @@ public void updateJob(
      * <pre>
      * Starts a job cancellation request. To access the job resource
      * after cancellation, call
-     * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
+     * regions/{region}/jobs.list
      * or
-     * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+     * regions/{region}/jobs.get.
      * </pre>
      */
     public void cancelJob(
@@ -750,9 +750,9 @@ public com.google.cloud.dataproc.v1beta2.Job updateJob(
      * <pre>
      * Starts a job cancellation request. To access the job resource
      * after cancellation, call
-     * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
+     * regions/{region}/jobs.list
      * or
-     * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+     * regions/{region}/jobs.get.
      * </pre>
      */
     public com.google.cloud.dataproc.v1beta2.Job cancelJob(
@@ -867,9 +867,9 @@ protected JobControllerFutureStub build(
      * <pre>
      * Starts a job cancellation request. To access the job resource
      * after cancellation, call
-     * [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
+     * regions/{region}/jobs.list
      * or
-     * [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+     * regions/{region}/jobs.get.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.cloud.dataproc.v1beta2.Job>
diff --git a/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceGrpc.java b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceGrpc.java
index a1ec46d1..d11291c0 100644
--- a/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceGrpc.java
+++ b/grpc-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceGrpc.java
@@ -500,7 +500,7 @@ public void getWorkflowTemplate(
      * This will cause any inflight jobs to be cancelled and workflow-owned
      * clusters to be deleted.
      * The [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+     * WorkflowMetadata.
      * Also see [Using
      * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
      * On successful completion,
@@ -718,7 +718,7 @@ public void getWorkflowTemplate(
      * This will cause any inflight jobs to be cancelled and workflow-owned
      * clusters to be deleted.
      * The [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+     * WorkflowMetadata.
      * Also see [Using
      * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
      * On successful completion,
@@ -885,7 +885,7 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplate getWorkflowTemplate(
      * This will cause any inflight jobs to be cancelled and workflow-owned
      * clusters to be deleted.
      * The [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+     * WorkflowMetadata.
      * Also see [Using
      * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
      * On successful completion,
@@ -1038,7 +1038,7 @@ protected WorkflowTemplateServiceFutureStub build(
      * This will cause any inflight jobs to be cancelled and workflow-owned
      * clusters to be deleted.
      * The [Operation.metadata][google.longrunning.Operation.metadata] will be
-     * [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+     * WorkflowMetadata.
      * Also see [Using
      * WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
      * On successful completion,
diff --git a/proto-google-cloud-dataproc-v1/clirr-ignored-differences.xml b/proto-google-cloud-dataproc-v1/clirr-ignored-differences.xml
index fa53d8b6..2803aab7 100644
--- a/proto-google-cloud-dataproc-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dataproc-v1/clirr-ignored-differences.xml
@@ -16,4 +16,13 @@
     <className>com/google/cloud/dataproc/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/dataproc/v1/ClusterName*</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/dataproc/v1/ServiceName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterName.java b/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterName.java
deleted file mode 100644
index 03c92db9..00000000
--- a/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterName.java
+++ /dev/null
@@ -1,223 +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.cloud.dataproc.v1;
-
-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 ClusterName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_CLUSTER =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/clusters/{cluster}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String cluster;
-
-  @Deprecated
-  protected ClusterName() {
-    project = null;
-    location = null;
-    cluster = null;
-  }
-
-  private ClusterName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    cluster = Preconditions.checkNotNull(builder.getCluster());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getCluster() {
-    return cluster;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static ClusterName of(String project, String location, String cluster) {
-    return newBuilder().setProject(project).setLocation(location).setCluster(cluster).build();
-  }
-
-  public static String format(String project, String location, String cluster) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setCluster(cluster)
-        .build()
-        .toString();
-  }
-
-  public static ClusterName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_CLUSTER.validatedMatch(
-            formattedString, "ClusterName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("cluster"));
-  }
-
-  public static List<ClusterName> parseList(List<String> formattedStrings) {
-    List<ClusterName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<ClusterName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (ClusterName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_CLUSTER.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 (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (cluster != null) {
-            fieldMapBuilder.put("cluster", cluster);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_CLUSTER.instantiate(
-        "project", project, "location", location, "cluster", cluster);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      ClusterName that = ((ClusterName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.cluster, that.cluster);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(cluster);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/clusters/{cluster}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String cluster;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getCluster() {
-      return cluster;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setCluster(String cluster) {
-      this.cluster = cluster;
-      return this;
-    }
-
-    private Builder(ClusterName clusterName) {
-      this.project = clusterName.project;
-      this.location = clusterName.location;
-      this.cluster = clusterName.cluster;
-    }
-
-    public ClusterName build() {
-      return new ClusterName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ServiceName.java b/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ServiceName.java
deleted file mode 100644
index 4d878f85..00000000
--- a/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ServiceName.java
+++ /dev/null
@@ -1,223 +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.cloud.dataproc.v1;
-
-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 ServiceName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_SERVICE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/services/{service}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String service;
-
-  @Deprecated
-  protected ServiceName() {
-    project = null;
-    location = null;
-    service = null;
-  }
-
-  private ServiceName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    service = Preconditions.checkNotNull(builder.getService());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getService() {
-    return service;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static ServiceName of(String project, String location, String service) {
-    return newBuilder().setProject(project).setLocation(location).setService(service).build();
-  }
-
-  public static String format(String project, String location, String service) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setService(service)
-        .build()
-        .toString();
-  }
-
-  public static ServiceName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_SERVICE.validatedMatch(
-            formattedString, "ServiceName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("service"));
-  }
-
-  public static List<ServiceName> parseList(List<String> formattedStrings) {
-    List<ServiceName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<ServiceName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (ServiceName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_SERVICE.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 (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (service != null) {
-            fieldMapBuilder.put("service", service);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_SERVICE.instantiate(
-        "project", project, "location", location, "service", service);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      ServiceName that = ((ServiceName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.service, that.service);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(service);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/services/{service}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String service;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getService() {
-      return service;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setService(String service) {
-      this.service = service;
-      return this;
-    }
-
-    private Builder(ServiceName serviceName) {
-      this.project = serviceName.project;
-      this.location = serviceName.location;
-      this.service = serviceName.service;
-    }
-
-    public ServiceName build() {
-      return new ServiceName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-dataproc-v1beta2/clirr-ignored-differences.xml b/proto-google-cloud-dataproc-v1beta2/clirr-ignored-differences.xml
index afdef514..33cf4b6d 100644
--- a/proto-google-cloud-dataproc-v1beta2/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dataproc-v1beta2/clirr-ignored-differences.xml
@@ -16,4 +16,9 @@
     <className>com/google/cloud/dataproc/v1beta2/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/dataproc/v1beta2/ClusterName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterName.java b/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterName.java
deleted file mode 100644
index 5fc405cc..00000000
--- a/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterName.java
+++ /dev/null
@@ -1,223 +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.cloud.dataproc.v1beta2;
-
-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 ClusterName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_CLUSTER =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/clusters/{cluster}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String cluster;
-
-  @Deprecated
-  protected ClusterName() {
-    project = null;
-    location = null;
-    cluster = null;
-  }
-
-  private ClusterName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    cluster = Preconditions.checkNotNull(builder.getCluster());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getCluster() {
-    return cluster;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static ClusterName of(String project, String location, String cluster) {
-    return newBuilder().setProject(project).setLocation(location).setCluster(cluster).build();
-  }
-
-  public static String format(String project, String location, String cluster) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setCluster(cluster)
-        .build()
-        .toString();
-  }
-
-  public static ClusterName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_CLUSTER.validatedMatch(
-            formattedString, "ClusterName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("cluster"));
-  }
-
-  public static List<ClusterName> parseList(List<String> formattedStrings) {
-    List<ClusterName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<ClusterName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (ClusterName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_CLUSTER.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 (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (cluster != null) {
-            fieldMapBuilder.put("cluster", cluster);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_CLUSTER.instantiate(
-        "project", project, "location", location, "cluster", cluster);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      ClusterName that = ((ClusterName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.cluster, that.cluster);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(cluster);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/clusters/{cluster}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String cluster;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getCluster() {
-      return cluster;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setCluster(String cluster) {
-      this.cluster = cluster;
-      return this;
-    }
-
-    private Builder(ClusterName clusterName) {
-      this.project = clusterName.project;
-      this.location = clusterName.location;
-      this.cluster = clusterName.cluster;
-    }
-
-    public ClusterName build() {
-      return new ClusterName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/clusters.proto b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/clusters.proto
index 8af436e0..51c9234a 100644
--- a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/clusters.proto
+++ b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/clusters.proto
@@ -48,7 +48,7 @@ service ClusterController {
 
   // Creates a cluster in a project. The returned
   // [Operation.metadata][google.longrunning.Operation.metadata] will be
-  // [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+  // ClusterOperationMetadata.
   rpc CreateCluster(CreateClusterRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
@@ -64,7 +64,7 @@ service ClusterController {
 
   // Updates a cluster in a project. The returned
   // [Operation.metadata][google.longrunning.Operation.metadata] will be
-  // [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+  // ClusterOperationMetadata.
   rpc UpdateCluster(UpdateClusterRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
@@ -81,7 +81,7 @@ service ClusterController {
 
   // Deletes a cluster in a project. The returned
   // [Operation.metadata][google.longrunning.Operation.metadata] will be
-  // [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+  // ClusterOperationMetadata.
   rpc DeleteCluster(DeleteClusterRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
@@ -113,7 +113,7 @@ service ClusterController {
 
   // Gets cluster diagnostic information. The returned
   // [Operation.metadata][google.longrunning.Operation.metadata] will be
-  // [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#clusteroperationmetadata).
+  // ClusterOperationMetadata.
   // After the operation completes,
   // [Operation.response][google.longrunning.Operation.response]
   // contains
diff --git a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/jobs.proto b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/jobs.proto
index c99f6791..cd3cc1f7 100644
--- a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/jobs.proto
+++ b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/jobs.proto
@@ -83,9 +83,9 @@ service JobController {
 
   // Starts a job cancellation request. To access the job resource
   // after cancellation, call
-  // [regions/{region}/jobs.list](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list)
+  // regions/{region}/jobs.list
   // or
-  // [regions/{region}/jobs.get](https://cloud.google.com/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
+  // regions/{region}/jobs.get.
   rpc CancelJob(CancelJobRequest) returns (Job) {
     option (google.api.http) = {
       post: "/v1beta2/projects/{project_id}/regions/{region}/jobs/{job_id}:cancel"
diff --git a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/workflow_templates.proto b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/workflow_templates.proto
index 48f2f719..829bb644 100644
--- a/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/workflow_templates.proto
+++ b/proto-google-cloud-dataproc-v1beta2/src/main/proto/google/cloud/dataproc/v1beta2/workflow_templates.proto
@@ -81,7 +81,7 @@ service WorkflowTemplateService {
   // clusters to be deleted.
   //
   // The [Operation.metadata][google.longrunning.Operation.metadata] will be
-  // [WorkflowMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1beta2#workflowmetadata).
+  // WorkflowMetadata.
   // Also see [Using
   // WorkflowMetadata](https://cloud.google.com/dataproc/docs/concepts/workflows/debugging#using_workflowmetadata).
   //