From 6e94a08aa5d520616e6deb436412ebd678c13d94 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 4 Aug 2021 23:18:41 +0000
Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#833)

Committer: @miraleung
PiperOrigin-RevId: 388535346

Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48

Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
---
 .../google/cloud/automl/v1/AutoMlClient.java  |  24 +-
 .../cloud/automl/v1/AutoMlSettings.java       |   3 +-
 .../automl/v1/PredictionServiceSettings.java  |   3 +-
 .../automl/v1/stub/AutoMlStubSettings.java    |   3 +-
 .../cloud/automl/v1/stub/GrpcAutoMlStub.java  | 200 +++++--------
 .../v1/stub/GrpcPredictionServiceStub.java    |  24 +-
 .../stub/PredictionServiceStubSettings.java   |   3 +-
 .../cloud/automl/v1beta1/AutoMlClient.java    |  38 +--
 .../cloud/automl/v1beta1/AutoMlSettings.java  |   3 +-
 .../v1beta1/PredictionServiceSettings.java    |   3 +-
 .../v1beta1/stub/AutoMlStubSettings.java      |   3 +-
 .../automl/v1beta1/stub/GrpcAutoMlStub.java   | 267 +++++++-----------
 .../stub/GrpcPredictionServiceStub.java       |  24 +-
 .../stub/PredictionServiceStubSettings.java   |   3 +-
 14 files changed, 200 insertions(+), 401 deletions(-)

diff --git a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlClient.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlClient.java
index 4068a6a89..732aee39d 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlClient.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.automl.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;
@@ -2442,12 +2441,7 @@ public static ApiFuture<ListDatasetsPagedResponse> createAsync(
           ListDatasetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListDatasetsPage, ListDatasetsPagedResponse>() {
-            @Override
-            public ListDatasetsPagedResponse apply(ListDatasetsPage input) {
-              return new ListDatasetsPagedResponse(input);
-            }
-          },
+          input -> new ListDatasetsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2521,14 +2515,7 @@ public static ApiFuture<ListModelsPagedResponse> createAsync(
       ApiFuture<ListModelsPage> futurePage =
           ListModelsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListModelsPage, ListModelsPagedResponse>() {
-            @Override
-            public ListModelsPagedResponse apply(ListModelsPage input) {
-              return new ListModelsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListModelsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListModelsPagedResponse(ListModelsPage page) {
@@ -2603,12 +2590,7 @@ public static ApiFuture<ListModelEvaluationsPagedResponse> createAsync(
           ListModelEvaluationsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListModelEvaluationsPage, ListModelEvaluationsPagedResponse>() {
-            @Override
-            public ListModelEvaluationsPagedResponse apply(ListModelEvaluationsPage input) {
-              return new ListModelEvaluationsPagedResponse(input);
-            }
-          },
+          input -> new ListModelEvaluationsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlSettings.java
index 30abd02eb..08f87f0b3 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlSettings.java
@@ -308,14 +308,13 @@ public AutoMlStubSettings.Builder getStubSettingsBuilder() {
       return ((AutoMlStubSettings.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-automl/src/main/java/com/google/cloud/automl/v1/PredictionServiceSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/PredictionServiceSettings.java
index 8b33c8792..4ccb91b1f 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/PredictionServiceSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/PredictionServiceSettings.java
@@ -169,14 +169,13 @@ public PredictionServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((PredictionServiceStubSettings.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-automl/src/main/java/com/google/cloud/automl/v1/stub/AutoMlStubSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/AutoMlStubSettings.java
index cf84e4eae..d106eba53 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/AutoMlStubSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/AutoMlStubSettings.java
@@ -1111,14 +1111,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-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcAutoMlStub.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcAutoMlStub.java
index 3864b4f4b..69b213aae 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcAutoMlStub.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcAutoMlStub.java
@@ -26,7 +26,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.automl.v1.AnnotationSpec;
 import com.google.cloud.automl.v1.CreateDatasetRequest;
@@ -61,7 +60,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;
 
@@ -322,208 +320,160 @@ protected GrpcAutoMlStub(
         GrpcCallSettings.<CreateDatasetRequest, Operation>newBuilder()
             .setMethodDescriptor(createDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateDatasetRequest 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<GetDatasetRequest, Dataset> getDatasetTransportSettings =
         GrpcCallSettings.<GetDatasetRequest, Dataset>newBuilder()
             .setMethodDescriptor(getDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetDatasetRequest 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<ListDatasetsRequest, ListDatasetsResponse> listDatasetsTransportSettings =
         GrpcCallSettings.<ListDatasetsRequest, ListDatasetsResponse>newBuilder()
             .setMethodDescriptor(listDatasetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListDatasetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListDatasetsRequest 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<UpdateDatasetRequest, Dataset> updateDatasetTransportSettings =
         GrpcCallSettings.<UpdateDatasetRequest, Dataset>newBuilder()
             .setMethodDescriptor(updateDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateDatasetRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("dataset.name", String.valueOf(request.getDataset().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("dataset.name", String.valueOf(request.getDataset().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteDatasetRequest, Operation> deleteDatasetTransportSettings =
         GrpcCallSettings.<DeleteDatasetRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteDatasetRequest 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<ImportDataRequest, Operation> importDataTransportSettings =
         GrpcCallSettings.<ImportDataRequest, Operation>newBuilder()
             .setMethodDescriptor(importDataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportDataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportDataRequest 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<ExportDataRequest, Operation> exportDataTransportSettings =
         GrpcCallSettings.<ExportDataRequest, Operation>newBuilder()
             .setMethodDescriptor(exportDataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportDataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportDataRequest 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<GetAnnotationSpecRequest, AnnotationSpec> getAnnotationSpecTransportSettings =
         GrpcCallSettings.<GetAnnotationSpecRequest, AnnotationSpec>newBuilder()
             .setMethodDescriptor(getAnnotationSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetAnnotationSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetAnnotationSpecRequest 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<CreateModelRequest, Operation> createModelTransportSettings =
         GrpcCallSettings.<CreateModelRequest, Operation>newBuilder()
             .setMethodDescriptor(createModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateModelRequest 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<GetModelRequest, Model> getModelTransportSettings =
         GrpcCallSettings.<GetModelRequest, Model>newBuilder()
             .setMethodDescriptor(getModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetModelRequest 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<ListModelsRequest, ListModelsResponse> listModelsTransportSettings =
         GrpcCallSettings.<ListModelsRequest, ListModelsResponse>newBuilder()
             .setMethodDescriptor(listModelsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListModelsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListModelsRequest 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<DeleteModelRequest, Operation> deleteModelTransportSettings =
         GrpcCallSettings.<DeleteModelRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteModelRequest 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<UpdateModelRequest, Model> updateModelTransportSettings =
         GrpcCallSettings.<UpdateModelRequest, Model>newBuilder()
             .setMethodDescriptor(updateModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateModelRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("model.name", String.valueOf(request.getModel().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("model.name", String.valueOf(request.getModel().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeployModelRequest, Operation> deployModelTransportSettings =
         GrpcCallSettings.<DeployModelRequest, Operation>newBuilder()
             .setMethodDescriptor(deployModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeployModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeployModelRequest 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<UndeployModelRequest, Operation> undeployModelTransportSettings =
         GrpcCallSettings.<UndeployModelRequest, Operation>newBuilder()
             .setMethodDescriptor(undeployModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UndeployModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(UndeployModelRequest 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<ExportModelRequest, Operation> exportModelTransportSettings =
         GrpcCallSettings.<ExportModelRequest, Operation>newBuilder()
             .setMethodDescriptor(exportModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportModelRequest 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<GetModelEvaluationRequest, ModelEvaluation>
@@ -531,13 +481,10 @@ public Map<String, String> extract(ExportModelRequest request) {
             GrpcCallSettings.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
                 .setMethodDescriptor(getModelEvaluationMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetModelEvaluationRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetModelEvaluationRequest 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<ListModelEvaluationsRequest, ListModelEvaluationsResponse>
@@ -545,13 +492,10 @@ public Map<String, String> extract(GetModelEvaluationRequest request) {
             GrpcCallSettings.<ListModelEvaluationsRequest, ListModelEvaluationsResponse>newBuilder()
                 .setMethodDescriptor(listModelEvaluationsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListModelEvaluationsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListModelEvaluationsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcPredictionServiceStub.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcPredictionServiceStub.java
index 053c0515f..75bd218d7 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcPredictionServiceStub.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/GrpcPredictionServiceStub.java
@@ -22,7 +22,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.automl.v1.BatchPredictRequest;
 import com.google.cloud.automl.v1.BatchPredictResult;
@@ -35,7 +34,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;
 
@@ -117,26 +115,20 @@ protected GrpcPredictionServiceStub(
         GrpcCallSettings.<PredictRequest, PredictResponse>newBuilder()
             .setMethodDescriptor(predictMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<PredictRequest>() {
-                  @Override
-                  public Map<String, String> extract(PredictRequest 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<BatchPredictRequest, Operation> batchPredictTransportSettings =
         GrpcCallSettings.<BatchPredictRequest, Operation>newBuilder()
             .setMethodDescriptor(batchPredictMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<BatchPredictRequest>() {
-                  @Override
-                  public Map<String, String> extract(BatchPredictRequest 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-automl/src/main/java/com/google/cloud/automl/v1/stub/PredictionServiceStubSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/PredictionServiceStubSettings.java
index ce6400d8c..c53328627 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/PredictionServiceStubSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1/stub/PredictionServiceStubSettings.java
@@ -302,14 +302,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-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlClient.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlClient.java
index 566f3d93e..61d73c4bf 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlClient.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.automl.v1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -3140,12 +3139,7 @@ public static ApiFuture<ListDatasetsPagedResponse> createAsync(
           ListDatasetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListDatasetsPage, ListDatasetsPagedResponse>() {
-            @Override
-            public ListDatasetsPagedResponse apply(ListDatasetsPage input) {
-              return new ListDatasetsPagedResponse(input);
-            }
-          },
+          input -> new ListDatasetsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3220,12 +3214,7 @@ public static ApiFuture<ListTableSpecsPagedResponse> createAsync(
           ListTableSpecsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListTableSpecsPage, ListTableSpecsPagedResponse>() {
-            @Override
-            public ListTableSpecsPagedResponse apply(ListTableSpecsPage input) {
-              return new ListTableSpecsPagedResponse(input);
-            }
-          },
+          input -> new ListTableSpecsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3301,12 +3290,7 @@ public static ApiFuture<ListColumnSpecsPagedResponse> createAsync(
           ListColumnSpecsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListColumnSpecsPage, ListColumnSpecsPagedResponse>() {
-            @Override
-            public ListColumnSpecsPagedResponse apply(ListColumnSpecsPage input) {
-              return new ListColumnSpecsPagedResponse(input);
-            }
-          },
+          input -> new ListColumnSpecsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -3382,14 +3366,7 @@ public static ApiFuture<ListModelsPagedResponse> createAsync(
       ApiFuture<ListModelsPage> futurePage =
           ListModelsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListModelsPage, ListModelsPagedResponse>() {
-            @Override
-            public ListModelsPagedResponse apply(ListModelsPage input) {
-              return new ListModelsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListModelsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListModelsPagedResponse(ListModelsPage page) {
@@ -3464,12 +3441,7 @@ public static ApiFuture<ListModelEvaluationsPagedResponse> createAsync(
           ListModelEvaluationsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListModelEvaluationsPage, ListModelEvaluationsPagedResponse>() {
-            @Override
-            public ListModelEvaluationsPagedResponse apply(ListModelEvaluationsPage input) {
-              return new ListModelEvaluationsPagedResponse(input);
-            }
-          },
+          input -> new ListModelEvaluationsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlSettings.java
index 9980a6e94..fc9e3171c 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/AutoMlSettings.java
@@ -346,14 +346,13 @@ public AutoMlStubSettings.Builder getStubSettingsBuilder() {
       return ((AutoMlStubSettings.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-automl/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceSettings.java
index 6e349145f..09bb14ee0 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceSettings.java
@@ -170,14 +170,13 @@ public PredictionServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((PredictionServiceStubSettings.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-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
index dbd8b6ed2..15f290225 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/AutoMlStubSettings.java
@@ -1356,14 +1356,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-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcAutoMlStub.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcAutoMlStub.java
index 862f29ef7..c5e37f35c 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcAutoMlStub.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcAutoMlStub.java
@@ -29,7 +29,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.automl.v1beta1.AnnotationSpec;
 import com.google.cloud.automl.v1beta1.ColumnSpec;
@@ -74,7 +73,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;
 
@@ -411,117 +409,90 @@ protected GrpcAutoMlStub(
         GrpcCallSettings.<CreateDatasetRequest, Dataset>newBuilder()
             .setMethodDescriptor(createDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateDatasetRequest 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<GetDatasetRequest, Dataset> getDatasetTransportSettings =
         GrpcCallSettings.<GetDatasetRequest, Dataset>newBuilder()
             .setMethodDescriptor(getDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetDatasetRequest 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<ListDatasetsRequest, ListDatasetsResponse> listDatasetsTransportSettings =
         GrpcCallSettings.<ListDatasetsRequest, ListDatasetsResponse>newBuilder()
             .setMethodDescriptor(listDatasetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListDatasetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListDatasetsRequest 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<UpdateDatasetRequest, Dataset> updateDatasetTransportSettings =
         GrpcCallSettings.<UpdateDatasetRequest, Dataset>newBuilder()
             .setMethodDescriptor(updateDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateDatasetRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("dataset.name", String.valueOf(request.getDataset().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("dataset.name", String.valueOf(request.getDataset().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteDatasetRequest, Operation> deleteDatasetTransportSettings =
         GrpcCallSettings.<DeleteDatasetRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteDatasetMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteDatasetRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteDatasetRequest 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<ImportDataRequest, Operation> importDataTransportSettings =
         GrpcCallSettings.<ImportDataRequest, Operation>newBuilder()
             .setMethodDescriptor(importDataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportDataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportDataRequest 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<ExportDataRequest, Operation> exportDataTransportSettings =
         GrpcCallSettings.<ExportDataRequest, Operation>newBuilder()
             .setMethodDescriptor(exportDataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportDataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportDataRequest 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<GetAnnotationSpecRequest, AnnotationSpec> getAnnotationSpecTransportSettings =
         GrpcCallSettings.<GetAnnotationSpecRequest, AnnotationSpec>newBuilder()
             .setMethodDescriptor(getAnnotationSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetAnnotationSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetAnnotationSpecRequest 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<GetTableSpecRequest, TableSpec> getTableSpecTransportSettings =
         GrpcCallSettings.<GetTableSpecRequest, TableSpec>newBuilder()
             .setMethodDescriptor(getTableSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetTableSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetTableSpecRequest 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<ListTableSpecsRequest, ListTableSpecsResponse>
@@ -529,39 +500,30 @@ public Map<String, String> extract(GetTableSpecRequest request) {
             GrpcCallSettings.<ListTableSpecsRequest, ListTableSpecsResponse>newBuilder()
                 .setMethodDescriptor(listTableSpecsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListTableSpecsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListTableSpecsRequest 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<UpdateTableSpecRequest, TableSpec> updateTableSpecTransportSettings =
         GrpcCallSettings.<UpdateTableSpecRequest, TableSpec>newBuilder()
             .setMethodDescriptor(updateTableSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateTableSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateTableSpecRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("table_spec.name", String.valueOf(request.getTableSpec().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("table_spec.name", String.valueOf(request.getTableSpec().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetColumnSpecRequest, ColumnSpec> getColumnSpecTransportSettings =
         GrpcCallSettings.<GetColumnSpecRequest, ColumnSpec>newBuilder()
             .setMethodDescriptor(getColumnSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetColumnSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetColumnSpecRequest 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<ListColumnSpecsRequest, ListColumnSpecsResponse>
@@ -569,118 +531,90 @@ public Map<String, String> extract(GetColumnSpecRequest request) {
             GrpcCallSettings.<ListColumnSpecsRequest, ListColumnSpecsResponse>newBuilder()
                 .setMethodDescriptor(listColumnSpecsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListColumnSpecsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListColumnSpecsRequest 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<UpdateColumnSpecRequest, ColumnSpec> updateColumnSpecTransportSettings =
         GrpcCallSettings.<UpdateColumnSpecRequest, ColumnSpec>newBuilder()
             .setMethodDescriptor(updateColumnSpecMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateColumnSpecRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateColumnSpecRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "column_spec.name", String.valueOf(request.getColumnSpec().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("column_spec.name", String.valueOf(request.getColumnSpec().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateModelRequest, Operation> createModelTransportSettings =
         GrpcCallSettings.<CreateModelRequest, Operation>newBuilder()
             .setMethodDescriptor(createModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateModelRequest 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<GetModelRequest, Model> getModelTransportSettings =
         GrpcCallSettings.<GetModelRequest, Model>newBuilder()
             .setMethodDescriptor(getModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetModelRequest 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<ListModelsRequest, ListModelsResponse> listModelsTransportSettings =
         GrpcCallSettings.<ListModelsRequest, ListModelsResponse>newBuilder()
             .setMethodDescriptor(listModelsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListModelsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListModelsRequest 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<DeleteModelRequest, Operation> deleteModelTransportSettings =
         GrpcCallSettings.<DeleteModelRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteModelRequest 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<DeployModelRequest, Operation> deployModelTransportSettings =
         GrpcCallSettings.<DeployModelRequest, Operation>newBuilder()
             .setMethodDescriptor(deployModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeployModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeployModelRequest 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<UndeployModelRequest, Operation> undeployModelTransportSettings =
         GrpcCallSettings.<UndeployModelRequest, Operation>newBuilder()
             .setMethodDescriptor(undeployModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UndeployModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(UndeployModelRequest 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<ExportModelRequest, Operation> exportModelTransportSettings =
         GrpcCallSettings.<ExportModelRequest, Operation>newBuilder()
             .setMethodDescriptor(exportModelMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportModelRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportModelRequest 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<ExportEvaluatedExamplesRequest, Operation>
@@ -688,13 +622,10 @@ public Map<String, String> extract(ExportModelRequest request) {
             GrpcCallSettings.<ExportEvaluatedExamplesRequest, Operation>newBuilder()
                 .setMethodDescriptor(exportEvaluatedExamplesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ExportEvaluatedExamplesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ExportEvaluatedExamplesRequest 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<GetModelEvaluationRequest, ModelEvaluation>
@@ -702,13 +633,10 @@ public Map<String, String> extract(ExportEvaluatedExamplesRequest request) {
             GrpcCallSettings.<GetModelEvaluationRequest, ModelEvaluation>newBuilder()
                 .setMethodDescriptor(getModelEvaluationMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetModelEvaluationRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetModelEvaluationRequest 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<ListModelEvaluationsRequest, ListModelEvaluationsResponse>
@@ -716,13 +644,10 @@ public Map<String, String> extract(GetModelEvaluationRequest request) {
             GrpcCallSettings.<ListModelEvaluationsRequest, ListModelEvaluationsResponse>newBuilder()
                 .setMethodDescriptor(listModelEvaluationsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListModelEvaluationsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListModelEvaluationsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcPredictionServiceStub.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcPredictionServiceStub.java
index 70a7cf9dc..c4d6358a0 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcPredictionServiceStub.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/GrpcPredictionServiceStub.java
@@ -23,7 +23,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.automl.v1beta1.BatchPredictRequest;
 import com.google.cloud.automl.v1beta1.BatchPredictResult;
@@ -36,7 +35,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;
 
@@ -119,26 +117,20 @@ protected GrpcPredictionServiceStub(
         GrpcCallSettings.<PredictRequest, PredictResponse>newBuilder()
             .setMethodDescriptor(predictMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<PredictRequest>() {
-                  @Override
-                  public Map<String, String> extract(PredictRequest 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<BatchPredictRequest, Operation> batchPredictTransportSettings =
         GrpcCallSettings.<BatchPredictRequest, Operation>newBuilder()
             .setMethodDescriptor(batchPredictMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<BatchPredictRequest>() {
-                  @Override
-                  public Map<String, String> extract(BatchPredictRequest 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-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/PredictionServiceStubSettings.java b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/PredictionServiceStubSettings.java
index b4551650a..de0c36797 100644
--- a/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/PredictionServiceStubSettings.java
+++ b/google-cloud-automl/src/main/java/com/google/cloud/automl/v1beta1/stub/PredictionServiceStubSettings.java
@@ -303,14 +303,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;
     }