From ce9a80cb69f638726534666175603fd1bca84a56 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 22:59:45 -0400
Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#815)

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

Committer: @miraleung
PiperOrigin-RevId: 388535346
Source-Link: googleapis/googleapis@d9eaf41
Source-Link: googleapis/googleapis-gen@976c5ab

chore(docs): remove mention about samples README
Fixes googleapis/java-logging#586.
Since no java repos have README in samples/ subfolder, we remove the mentioning from README
Source-Link: googleapis/synthtool@82fe6d9
Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:7384f9f7e64785e8d765266519fe217f3b7ab15837326e5bda548b23dc16aeeb

chore(java): add a method to copy a java method and rename it
chore: add method to deprecate java methods
Source-Link: googleapis/synthtool@f7d068c
Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:8aaf4b4336ac8ca344681866b3a78f73be5999750179022393ecbedd7069acb5

*the metadata field change for AnalyzeIamPolicyLongrunning is BACKWARD INCOMPATIBLE. Adding this change expand our ability to return richer metadata information for the longrunning operation. Due to the small usage of this API, we've contacted all the customers to make sure they are not using the metadata field and hence won't be broken by this change.

Committer: @aaronlichen-hp
PiperOrigin-RevId: 386530026
feat!: Change metadata field for the AnalyzeIamPolicyLongrunning
Source-Link: googleapis/googleapis@746461e
Source-Link: googleapis/googleapis-gen@c2c1745
feat: Add AnalyzeMove API. feat: Add read_mask field for SearchAllResourcesRequest
feat: Add VersionedResource/AttachedResource fields for ResourceSearchResult
---
 .../cloud/asset/v1/AssetServiceClient.java    |  24 +--
 .../cloud/asset/v1/AssetServiceSettings.java  |   3 +-
 .../v1/stub/AssetServiceStubSettings.java     |   3 +-
 .../asset/v1/stub/GrpcAssetServiceStub.java   | 154 +++++++-----------
 .../asset/v1p1beta1/AssetServiceClient.java   |  15 +-
 .../asset/v1p1beta1/AssetServiceSettings.java |   3 +-
 .../stub/AssetServiceStubSettings.java        |   3 +-
 .../v1p1beta1/stub/GrpcAssetServiceStub.java  |  24 +--
 .../asset/v1p2beta1/AssetServiceSettings.java |   3 +-
 .../stub/AssetServiceStubSettings.java        |   3 +-
 .../v1p2beta1/stub/GrpcAssetServiceStub.java  |  57 +++----
 .../asset/v1p4beta1/AssetServiceSettings.java |   3 +-
 .../stub/AssetServiceStubSettings.java        |   3 +-
 .../v1p4beta1/stub/GrpcAssetServiceStub.java  |  32 ++--
 .../asset/v1p5beta1/AssetServiceClient.java   |  10 +-
 .../asset/v1p5beta1/AssetServiceSettings.java |   3 +-
 .../stub/AssetServiceStubSettings.java        |   3 +-
 .../v1p5beta1/stub/GrpcAssetServiceStub.java  |  13 +-
 .../asset/v1p7beta1/AssetServiceSettings.java |   3 +-
 .../stub/AssetServiceStubSettings.java        |   3 +-
 .../v1p7beta1/stub/GrpcAssetServiceStub.java  |  13 +-
 21 files changed, 122 insertions(+), 256 deletions(-)

diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java
index ee57bc796..17ca174a0 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.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;
@@ -1510,14 +1509,7 @@ public static ApiFuture<ListAssetsPagedResponse> createAsync(
       ApiFuture<ListAssetsPage> futurePage =
           ListAssetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListAssetsPage, ListAssetsPagedResponse>() {
-            @Override
-            public ListAssetsPagedResponse apply(ListAssetsPage input) {
-              return new ListAssetsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListAssetsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListAssetsPagedResponse(ListAssetsPage page) {
@@ -1592,12 +1584,7 @@ public static ApiFuture<SearchAllResourcesPagedResponse> createAsync(
           SearchAllResourcesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchAllResourcesPage, SearchAllResourcesPagedResponse>() {
-            @Override
-            public SearchAllResourcesPagedResponse apply(SearchAllResourcesPage input) {
-              return new SearchAllResourcesPagedResponse(input);
-            }
-          },
+          input -> new SearchAllResourcesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1682,12 +1669,7 @@ public static ApiFuture<SearchAllIamPoliciesPagedResponse> createAsync(
           SearchAllIamPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchAllIamPoliciesPage, SearchAllIamPoliciesPagedResponse>() {
-            @Override
-            public SearchAllIamPoliciesPagedResponse apply(SearchAllIamPoliciesPage input) {
-              return new SearchAllIamPoliciesPagedResponse(input);
-            }
-          },
+          input -> new SearchAllIamPoliciesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceSettings.java
index d5b8025e8..127a059df 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceSettings.java
@@ -249,14 +249,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
index c5d57bac5..9c7ac8a9f 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
@@ -844,14 +844,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-asset/src/main/java/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java
index 97ccbc764..6971963b5 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.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.asset.v1.AnalyzeIamPolicyLongrunningMetadata;
 import com.google.cloud.asset.v1.AnalyzeIamPolicyLongrunningRequest;
@@ -59,7 +58,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;
 
@@ -271,26 +269,20 @@ protected GrpcAssetServiceStub(
         GrpcCallSettings.<ExportAssetsRequest, Operation>newBuilder()
             .setMethodDescriptor(exportAssetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportAssetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportAssetsRequest 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<ListAssetsRequest, ListAssetsResponse> listAssetsTransportSettings =
         GrpcCallSettings.<ListAssetsRequest, ListAssetsResponse>newBuilder()
             .setMethodDescriptor(listAssetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListAssetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListAssetsRequest 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<BatchGetAssetsHistoryRequest, BatchGetAssetsHistoryResponse>
@@ -299,78 +291,60 @@ public Map<String, String> extract(ListAssetsRequest request) {
                 .<BatchGetAssetsHistoryRequest, BatchGetAssetsHistoryResponse>newBuilder()
                 .setMethodDescriptor(batchGetAssetsHistoryMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<BatchGetAssetsHistoryRequest>() {
-                      @Override
-                      public Map<String, String> extract(BatchGetAssetsHistoryRequest 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<CreateFeedRequest, Feed> createFeedTransportSettings =
         GrpcCallSettings.<CreateFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(createFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateFeedRequest 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<GetFeedRequest, Feed> getFeedTransportSettings =
         GrpcCallSettings.<GetFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(getFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetFeedRequest 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<ListFeedsRequest, ListFeedsResponse> listFeedsTransportSettings =
         GrpcCallSettings.<ListFeedsRequest, ListFeedsResponse>newBuilder()
             .setMethodDescriptor(listFeedsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListFeedsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListFeedsRequest 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<UpdateFeedRequest, Feed> updateFeedTransportSettings =
         GrpcCallSettings.<UpdateFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(updateFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateFeedRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("feed.name", String.valueOf(request.getFeed().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("feed.name", String.valueOf(request.getFeed().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteFeedRequest, Empty> deleteFeedTransportSettings =
         GrpcCallSettings.<DeleteFeedRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteFeedRequest 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<SearchAllResourcesRequest, SearchAllResourcesResponse>
@@ -378,13 +352,10 @@ public Map<String, String> extract(DeleteFeedRequest request) {
             GrpcCallSettings.<SearchAllResourcesRequest, SearchAllResourcesResponse>newBuilder()
                 .setMethodDescriptor(searchAllResourcesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SearchAllResourcesRequest>() {
-                      @Override
-                      public Map<String, String> extract(SearchAllResourcesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("scope", String.valueOf(request.getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("scope", String.valueOf(request.getScope()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>
@@ -392,13 +363,10 @@ public Map<String, String> extract(SearchAllResourcesRequest request) {
             GrpcCallSettings.<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>newBuilder()
                 .setMethodDescriptor(searchAllIamPoliciesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SearchAllIamPoliciesRequest>() {
-                      @Override
-                      public Map<String, String> extract(SearchAllIamPoliciesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("scope", String.valueOf(request.getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("scope", String.valueOf(request.getScope()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<AnalyzeIamPolicyRequest, AnalyzeIamPolicyResponse>
@@ -406,15 +374,12 @@ public Map<String, String> extract(SearchAllIamPoliciesRequest request) {
             GrpcCallSettings.<AnalyzeIamPolicyRequest, AnalyzeIamPolicyResponse>newBuilder()
                 .setMethodDescriptor(analyzeIamPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AnalyzeIamPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(AnalyzeIamPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "analysis_query.scope",
-                            String.valueOf(request.getAnalysisQuery().getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "analysis_query.scope",
+                          String.valueOf(request.getAnalysisQuery().getScope()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<AnalyzeIamPolicyLongrunningRequest, Operation>
@@ -422,29 +387,22 @@ public Map<String, String> extract(AnalyzeIamPolicyRequest request) {
             GrpcCallSettings.<AnalyzeIamPolicyLongrunningRequest, Operation>newBuilder()
                 .setMethodDescriptor(analyzeIamPolicyLongrunningMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AnalyzeIamPolicyLongrunningRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          AnalyzeIamPolicyLongrunningRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "analysis_query.scope",
-                            String.valueOf(request.getAnalysisQuery().getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "analysis_query.scope",
+                          String.valueOf(request.getAnalysisQuery().getScope()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<AnalyzeMoveRequest, AnalyzeMoveResponse> analyzeMoveTransportSettings =
         GrpcCallSettings.<AnalyzeMoveRequest, AnalyzeMoveResponse>newBuilder()
             .setMethodDescriptor(analyzeMoveMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AnalyzeMoveRequest>() {
-                  @Override
-                  public Map<String, String> extract(AnalyzeMoveRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceClient.java
index 9e34889bb..14756e192 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceClient.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.v1p1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -509,12 +508,7 @@ public static ApiFuture<SearchAllResourcesPagedResponse> createAsync(
           SearchAllResourcesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchAllResourcesPage, SearchAllResourcesPagedResponse>() {
-            @Override
-            public SearchAllResourcesPagedResponse apply(SearchAllResourcesPage input) {
-              return new SearchAllResourcesPagedResponse(input);
-            }
-          },
+          input -> new SearchAllResourcesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -599,12 +593,7 @@ public static ApiFuture<SearchAllIamPoliciesPagedResponse> createAsync(
           SearchAllIamPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<SearchAllIamPoliciesPage, SearchAllIamPoliciesPagedResponse>() {
-            @Override
-            public SearchAllIamPoliciesPagedResponse apply(SearchAllIamPoliciesPage input) {
-              return new SearchAllIamPoliciesPagedResponse(input);
-            }
-          },
+          input -> new SearchAllIamPoliciesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceSettings.java
index c81703909..82ca8fbda 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceSettings.java
@@ -171,14 +171,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
index fa8de1c26..a889b6a2d 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
@@ -429,14 +429,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-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/GrpcAssetServiceStub.java
index dcbbc91bc..93e726b95 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/GrpcAssetServiceStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.asset.v1p1beta1.SearchAllIamPoliciesRequest;
 import com.google.cloud.asset.v1p1beta1.SearchAllIamPoliciesResponse;
@@ -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;
 
@@ -127,13 +125,10 @@ protected GrpcAssetServiceStub(
             GrpcCallSettings.<SearchAllResourcesRequest, SearchAllResourcesResponse>newBuilder()
                 .setMethodDescriptor(searchAllResourcesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SearchAllResourcesRequest>() {
-                      @Override
-                      public Map<String, String> extract(SearchAllResourcesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("scope", String.valueOf(request.getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("scope", String.valueOf(request.getScope()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>
@@ -141,13 +136,10 @@ public Map<String, String> extract(SearchAllResourcesRequest request) {
             GrpcCallSettings.<SearchAllIamPoliciesRequest, SearchAllIamPoliciesResponse>newBuilder()
                 .setMethodDescriptor(searchAllIamPoliciesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<SearchAllIamPoliciesRequest>() {
-                      @Override
-                      public Map<String, String> extract(SearchAllIamPoliciesRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("scope", String.valueOf(request.getScope()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("scope", String.valueOf(request.getScope()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceSettings.java
index ea4451ecc..05ebf547a 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceSettings.java
@@ -177,14 +177,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
index 6f93a4537..be2e5e9b9 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
@@ -333,14 +333,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-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub.java
index e9d702d76..9aeb61b45 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub.java
@@ -22,7 +22,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.asset.v1p2beta1.CreateFeedRequest;
 import com.google.cloud.asset.v1p2beta1.DeleteFeedRequest;
@@ -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;
 
@@ -143,65 +141,50 @@ protected GrpcAssetServiceStub(
         GrpcCallSettings.<CreateFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(createFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateFeedRequest 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<GetFeedRequest, Feed> getFeedTransportSettings =
         GrpcCallSettings.<GetFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(getFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetFeedRequest 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<ListFeedsRequest, ListFeedsResponse> listFeedsTransportSettings =
         GrpcCallSettings.<ListFeedsRequest, ListFeedsResponse>newBuilder()
             .setMethodDescriptor(listFeedsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListFeedsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListFeedsRequest 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<UpdateFeedRequest, Feed> updateFeedTransportSettings =
         GrpcCallSettings.<UpdateFeedRequest, Feed>newBuilder()
             .setMethodDescriptor(updateFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateFeedRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("feed.name", String.valueOf(request.getFeed().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("feed.name", String.valueOf(request.getFeed().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteFeedRequest, Empty> deleteFeedTransportSettings =
         GrpcCallSettings.<DeleteFeedRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteFeedMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteFeedRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteFeedRequest 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-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceSettings.java
index 361dff4fa..1f64fc272 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceSettings.java
@@ -175,14 +175,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
index a8ce42423..56758b14b 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
@@ -335,14 +335,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-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/GrpcAssetServiceStub.java
index 8907df6d6..49f058350 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/GrpcAssetServiceStub.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.asset.v1p4beta1.AnalyzeIamPolicyRequest;
 import com.google.cloud.asset.v1p4beta1.AnalyzeIamPolicyResponse;
@@ -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;
 
@@ -127,15 +125,12 @@ protected GrpcAssetServiceStub(
             GrpcCallSettings.<AnalyzeIamPolicyRequest, AnalyzeIamPolicyResponse>newBuilder()
                 .setMethodDescriptor(analyzeIamPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AnalyzeIamPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(AnalyzeIamPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "analysis_query.parent",
-                            String.valueOf(request.getAnalysisQuery().getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "analysis_query.parent",
+                          String.valueOf(request.getAnalysisQuery().getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<ExportIamPolicyAnalysisRequest, Operation>
@@ -143,15 +138,12 @@ public Map<String, String> extract(AnalyzeIamPolicyRequest request) {
             GrpcCallSettings.<ExportIamPolicyAnalysisRequest, Operation>newBuilder()
                 .setMethodDescriptor(exportIamPolicyAnalysisMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ExportIamPolicyAnalysisRequest>() {
-                      @Override
-                      public Map<String, String> extract(ExportIamPolicyAnalysisRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "analysis_query.parent",
-                            String.valueOf(request.getAnalysisQuery().getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "analysis_query.parent",
+                          String.valueOf(request.getAnalysisQuery().getParent()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceClient.java
index 098df1722..dfb14d73e 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceClient.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.v1p5beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -296,14 +295,7 @@ public static ApiFuture<ListAssetsPagedResponse> createAsync(
       ApiFuture<ListAssetsPage> futurePage =
           ListAssetsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListAssetsPage, ListAssetsPagedResponse>() {
-            @Override
-            public ListAssetsPagedResponse apply(ListAssetsPage input) {
-              return new ListAssetsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListAssetsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListAssetsPagedResponse(ListAssetsPage page) {
diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceSettings.java
index bc019eb22..d899b37b5 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/AssetServiceSettings.java
@@ -160,14 +160,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/AssetServiceStubSettings.java
index d9f69ab9c..a1873eb3c 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/AssetServiceStubSettings.java
@@ -314,14 +314,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-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/GrpcAssetServiceStub.java
index f6aa1a9e8..8d8f23844 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p5beta1/stub/GrpcAssetServiceStub.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.asset.v1p5beta1.ListAssetsRequest;
 import com.google.cloud.asset.v1p5beta1.ListAssetsResponse;
@@ -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;
 
@@ -104,13 +102,10 @@ protected GrpcAssetServiceStub(
         GrpcCallSettings.<ListAssetsRequest, ListAssetsResponse>newBuilder()
             .setMethodDescriptor(listAssetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListAssetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListAssetsRequest 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-asset/src/main/java/com/google/cloud/asset/v1p7beta1/AssetServiceSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/AssetServiceSettings.java
index 003eab5bc..efc86c20c 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/AssetServiceSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/AssetServiceSettings.java
@@ -164,14 +164,13 @@ public AssetServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((AssetServiceStubSettings.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-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/AssetServiceStubSettings.java
index dbd8bbe36..93b117b35 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/AssetServiceStubSettings.java
@@ -291,14 +291,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-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/GrpcAssetServiceStub.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/GrpcAssetServiceStub.java
index 4eda47f3f..92655bae4 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/GrpcAssetServiceStub.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p7beta1/stub/GrpcAssetServiceStub.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.asset.v1p7beta1.ExportAssetsRequest;
 import com.google.cloud.asset.v1p7beta1.ExportAssetsResponse;
@@ -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 GrpcAssetServiceStub(
         GrpcCallSettings.<ExportAssetsRequest, Operation>newBuilder()
             .setMethodDescriptor(exportAssetsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportAssetsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportAssetsRequest 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();