From bd37507e410b01f81e86d8ce6cd763d50c9cfd40 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:20:42 +0000
Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#370)

Committer: @miraleung
PiperOrigin-RevId: 388535346

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

Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
---
 .../v1beta1/CatalogServiceClient.java         |  8 +--
 .../v1beta1/CatalogServiceSettings.java       |  3 +-
 .../PredictionApiKeyRegistryClient.java       | 11 +--
 .../PredictionApiKeyRegistrySettings.java     |  3 +-
 .../v1beta1/PredictionServiceClient.java      | 10 +--
 .../v1beta1/PredictionServiceSettings.java    |  3 +-
 .../v1beta1/UserEventServiceClient.java       |  8 +--
 .../v1beta1/UserEventServiceSettings.java     |  3 +-
 .../stub/CatalogServiceStubSettings.java      |  3 +-
 .../v1beta1/stub/GrpcCatalogServiceStub.java  | 68 +++++++------------
 .../GrpcPredictionApiKeyRegistryStub.java     | 38 ++++-------
 .../stub/GrpcPredictionServiceStub.java       | 13 ++--
 .../stub/GrpcUserEventServiceStub.java        | 57 ++++++----------
 .../PredictionApiKeyRegistryStubSettings.java |  3 +-
 .../stub/PredictionServiceStubSettings.java   |  3 +-
 .../stub/UserEventServiceStubSettings.java    |  3 +-
 16 files changed, 72 insertions(+), 165 deletions(-)

diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceClient.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceClient.java
index abb87c7f..7205754c 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceClient.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.recommendationengine.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;
@@ -978,12 +977,7 @@ public static ApiFuture<ListCatalogItemsPagedResponse> createAsync(
           ListCatalogItemsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListCatalogItemsPage, ListCatalogItemsPagedResponse>() {
-            @Override
-            public ListCatalogItemsPagedResponse apply(ListCatalogItemsPage input) {
-              return new ListCatalogItemsPagedResponse(input);
-            }
-          },
+          input -> new ListCatalogItemsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceSettings.java
index b3ff24f6..cb277f6a 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogServiceSettings.java
@@ -198,14 +198,13 @@ public CatalogServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((CatalogServiceStubSettings.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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistryClient.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistryClient.java
index 379d80eb..17b270ea 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistryClient.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistryClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.recommendationengine.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;
@@ -637,15 +636,7 @@ public static ApiFuture<ListPredictionApiKeyRegistrationsPagedResponse> createAs
               .createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<
-              ListPredictionApiKeyRegistrationsPage,
-              ListPredictionApiKeyRegistrationsPagedResponse>() {
-            @Override
-            public ListPredictionApiKeyRegistrationsPagedResponse apply(
-                ListPredictionApiKeyRegistrationsPage input) {
-              return new ListPredictionApiKeyRegistrationsPagedResponse(input);
-            }
-          },
+          input -> new ListPredictionApiKeyRegistrationsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistrySettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistrySettings.java
index 845ee0f9..a8e25589 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistrySettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionApiKeyRegistrySettings.java
@@ -184,14 +184,13 @@ public PredictionApiKeyRegistryStubSettings.Builder getStubSettingsBuilder() {
       return ((PredictionApiKeyRegistryStubSettings.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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceClient.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceClient.java
index d42b8a98..3a243ceb 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceClient.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.recommendationengine.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;
@@ -449,14 +448,7 @@ public static ApiFuture<PredictPagedResponse> createAsync(
       ApiFuture<PredictPage> futurePage =
           PredictPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<PredictPage, PredictPagedResponse>() {
-            @Override
-            public PredictPagedResponse apply(PredictPage input) {
-              return new PredictPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new PredictPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private PredictPagedResponse(PredictPage page) {
diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceSettings.java
index db691460..4158f9cf 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/PredictionServiceSettings.java
@@ -162,14 +162,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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceClient.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceClient.java
index ac2bc8cc..6630c13f 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceClient.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceClient.java
@@ -17,7 +17,6 @@
 package com.google.cloud.recommendationengine.v1beta1;
 
 import com.google.api.HttpBody;
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1062,12 +1061,7 @@ public static ApiFuture<ListUserEventsPagedResponse> createAsync(
           ListUserEventsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListUserEventsPage, ListUserEventsPagedResponse>() {
-            @Override
-            public ListUserEventsPagedResponse apply(ListUserEventsPage input) {
-              return new ListUserEventsPagedResponse(input);
-            }
-          },
+          input -> new ListUserEventsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceSettings.java
index 8373ccbf..298de30c 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/UserEventServiceSettings.java
@@ -199,14 +199,13 @@ public UserEventServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((UserEventServiceStubSettings.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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/CatalogServiceStubSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/CatalogServiceStubSettings.java
index 87cebcfa..4c3ee37d 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/CatalogServiceStubSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/CatalogServiceStubSettings.java
@@ -471,14 +471,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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcCatalogServiceStub.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcCatalogServiceStub.java
index 68a821a0..7df7f21e 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcCatalogServiceStub.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcCatalogServiceStub.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.recommendationengine.v1beta1.CatalogItem;
 import com.google.cloud.recommendationengine.v1beta1.CreateCatalogItemRequest;
@@ -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;
 
@@ -185,26 +183,20 @@ protected GrpcCatalogServiceStub(
         GrpcCallSettings.<CreateCatalogItemRequest, CatalogItem>newBuilder()
             .setMethodDescriptor(createCatalogItemMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateCatalogItemRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateCatalogItemRequest 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<GetCatalogItemRequest, CatalogItem> getCatalogItemTransportSettings =
         GrpcCallSettings.<GetCatalogItemRequest, CatalogItem>newBuilder()
             .setMethodDescriptor(getCatalogItemMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetCatalogItemRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetCatalogItemRequest 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<ListCatalogItemsRequest, ListCatalogItemsResponse>
@@ -212,52 +204,40 @@ public Map<String, String> extract(GetCatalogItemRequest request) {
             GrpcCallSettings.<ListCatalogItemsRequest, ListCatalogItemsResponse>newBuilder()
                 .setMethodDescriptor(listCatalogItemsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListCatalogItemsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListCatalogItemsRequest 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<UpdateCatalogItemRequest, CatalogItem> updateCatalogItemTransportSettings =
         GrpcCallSettings.<UpdateCatalogItemRequest, CatalogItem>newBuilder()
             .setMethodDescriptor(updateCatalogItemMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateCatalogItemRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateCatalogItemRequest 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<DeleteCatalogItemRequest, Empty> deleteCatalogItemTransportSettings =
         GrpcCallSettings.<DeleteCatalogItemRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteCatalogItemMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteCatalogItemRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteCatalogItemRequest 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<ImportCatalogItemsRequest, Operation> importCatalogItemsTransportSettings =
         GrpcCallSettings.<ImportCatalogItemsRequest, Operation>newBuilder()
             .setMethodDescriptor(importCatalogItemsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportCatalogItemsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportCatalogItemsRequest 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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionApiKeyRegistryStub.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionApiKeyRegistryStub.java
index 0bc5107f..3b4a8ad0 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionApiKeyRegistryStub.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionApiKeyRegistryStub.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.recommendationengine.v1beta1.CreatePredictionApiKeyRegistrationRequest;
 import com.google.cloud.recommendationengine.v1beta1.DeletePredictionApiKeyRegistrationRequest;
@@ -37,7 +36,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;
 
@@ -158,14 +156,10 @@ protected GrpcPredictionApiKeyRegistryStub(
                     newBuilder()
                 .setMethodDescriptor(createPredictionApiKeyRegistrationMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreatePredictionApiKeyRegistrationRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          CreatePredictionApiKeyRegistrationRequest 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<
@@ -177,14 +171,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(listPredictionApiKeyRegistrationsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListPredictionApiKeyRegistrationsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          ListPredictionApiKeyRegistrationsRequest 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<DeletePredictionApiKeyRegistrationRequest, Empty>
@@ -192,14 +182,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<DeletePredictionApiKeyRegistrationRequest, Empty>newBuilder()
                 .setMethodDescriptor(deletePredictionApiKeyRegistrationMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeletePredictionApiKeyRegistrationRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          DeletePredictionApiKeyRegistrationRequest 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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionServiceStub.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionServiceStub.java
index eb620106..015ea270 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionServiceStub.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcPredictionServiceStub.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.recommendationengine.v1beta1.PredictRequest;
 import com.google.cloud.recommendationengine.v1beta1.PredictResponse;
@@ -33,7 +32,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -105,13 +103,10 @@ 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();
 
diff --git a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcUserEventServiceStub.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcUserEventServiceStub.java
index 3da2ec23..1accb2bd 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcUserEventServiceStub.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/GrpcUserEventServiceStub.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.recommendationengine.v1beta1.CollectUserEventRequest;
 import com.google.cloud.recommendationengine.v1beta1.ImportMetadata;
@@ -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;
 
@@ -175,26 +173,20 @@ protected GrpcUserEventServiceStub(
         GrpcCallSettings.<WriteUserEventRequest, UserEvent>newBuilder()
             .setMethodDescriptor(writeUserEventMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<WriteUserEventRequest>() {
-                  @Override
-                  public Map<String, String> extract(WriteUserEventRequest 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<CollectUserEventRequest, HttpBody> collectUserEventTransportSettings =
         GrpcCallSettings.<CollectUserEventRequest, HttpBody>newBuilder()
             .setMethodDescriptor(collectUserEventMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CollectUserEventRequest>() {
-                  @Override
-                  public Map<String, String> extract(CollectUserEventRequest 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<ListUserEventsRequest, ListUserEventsResponse>
@@ -202,39 +194,30 @@ public Map<String, String> extract(CollectUserEventRequest request) {
             GrpcCallSettings.<ListUserEventsRequest, ListUserEventsResponse>newBuilder()
                 .setMethodDescriptor(listUserEventsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListUserEventsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListUserEventsRequest 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<PurgeUserEventsRequest, Operation> purgeUserEventsTransportSettings =
         GrpcCallSettings.<PurgeUserEventsRequest, Operation>newBuilder()
             .setMethodDescriptor(purgeUserEventsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<PurgeUserEventsRequest>() {
-                  @Override
-                  public Map<String, String> extract(PurgeUserEventsRequest 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<ImportUserEventsRequest, Operation> importUserEventsTransportSettings =
         GrpcCallSettings.<ImportUserEventsRequest, Operation>newBuilder()
             .setMethodDescriptor(importUserEventsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ImportUserEventsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ImportUserEventsRequest 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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionApiKeyRegistryStubSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionApiKeyRegistryStubSettings.java
index e25d2292..be3d8716 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionApiKeyRegistryStubSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionApiKeyRegistryStubSettings.java
@@ -409,14 +409,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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionServiceStubSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionServiceStubSettings.java
index 18e8572f..44c36c6e 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionServiceStubSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/PredictionServiceStubSettings.java
@@ -317,14 +317,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-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/UserEventServiceStubSettings.java b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/UserEventServiceStubSettings.java
index 888f57e6..9f569974 100644
--- a/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/UserEventServiceStubSettings.java
+++ b/google-cloud-recommendations-ai/src/main/java/com/google/cloud/recommendationengine/v1beta1/stub/UserEventServiceStubSettings.java
@@ -485,14 +485,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;
     }