From 760ed31b2976011a284dcb2e5e96165ef1495165 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 03:34:30 +0000
Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#327)

Committer: @miraleung
PiperOrigin-RevId: 388535346

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

Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
---
 .../osconfig/v1/OsConfigServiceClient.java    |  24 +-
 .../osconfig/v1/OsConfigServiceSettings.java  |   3 +-
 .../v1/stub/GrpcOsConfigServiceStub.java      | 106 +++------
 .../v1/stub/OsConfigServiceStubSettings.java  |   3 +-
 .../v1alpha/OsConfigZonalServiceClient.java   |  41 +---
 .../v1alpha/OsConfigZonalServiceSettings.java |   3 +-
 .../stub/GrpcOsConfigZonalServiceStub.java    | 141 ++++--------
 .../OsConfigZonalServiceStubSettings.java     |   3 +-
 .../v1beta/OsConfigServiceClient.java         |  31 +--
 .../v1beta/OsConfigServiceSettings.java       |   3 +-
 .../v1beta/stub/GrpcOsConfigServiceStub.java  | 181 +++++----------
 .../stub/OsConfigServiceStubSettings.java     |   3 +-
 .../clirr-ignored-differences.xml             |   8 +
 .../cloud/osconfig/v1/InstanceName.java       | 217 ------------------
 14 files changed, 173 insertions(+), 594 deletions(-)
 delete mode 100644 proto-google-cloud-os-config-v1/src/main/java/com/google/cloud/osconfig/v1/InstanceName.java

diff --git a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceClient.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceClient.java
index 0ce73511..824bdf8c 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceClient.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.osconfig.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;
@@ -1193,12 +1192,7 @@ public static ApiFuture<ListPatchJobsPagedResponse> createAsync(
           ListPatchJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPatchJobsPage, ListPatchJobsPagedResponse>() {
-            @Override
-            public ListPatchJobsPagedResponse apply(ListPatchJobsPage input) {
-              return new ListPatchJobsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchJobsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1288,14 +1282,7 @@ public static ApiFuture<ListPatchJobInstanceDetailsPagedResponse> createAsync(
               .createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<
-              ListPatchJobInstanceDetailsPage, ListPatchJobInstanceDetailsPagedResponse>() {
-            @Override
-            public ListPatchJobInstanceDetailsPagedResponse apply(
-                ListPatchJobInstanceDetailsPage input) {
-              return new ListPatchJobInstanceDetailsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchJobInstanceDetailsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1391,12 +1378,7 @@ public static ApiFuture<ListPatchDeploymentsPagedResponse> createAsync(
           ListPatchDeploymentsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPatchDeploymentsPage, ListPatchDeploymentsPagedResponse>() {
-            @Override
-            public ListPatchDeploymentsPagedResponse apply(ListPatchDeploymentsPage input) {
-              return new ListPatchDeploymentsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchDeploymentsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceSettings.java
index 046b3247..7c07f208 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/OsConfigServiceSettings.java
@@ -221,14 +221,13 @@ public OsConfigServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((OsConfigServiceStubSettings.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-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/GrpcOsConfigServiceStub.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/GrpcOsConfigServiceStub.java
index d578a8b8..f25a9dd8 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/GrpcOsConfigServiceStub.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/GrpcOsConfigServiceStub.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.osconfig.v1.PatchDeployments;
 import com.google.cloud.osconfig.v1.PatchJobs;
@@ -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;
 
@@ -249,13 +247,10 @@ protected GrpcOsConfigServiceStub(
             GrpcCallSettings.<PatchJobs.ExecutePatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(executePatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ExecutePatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.ExecutePatchJobRequest 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<PatchJobs.GetPatchJobRequest, PatchJobs.PatchJob>
@@ -263,13 +258,10 @@ public Map<String, String> extract(PatchJobs.ExecutePatchJobRequest request) {
             GrpcCallSettings.<PatchJobs.GetPatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(getPatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.GetPatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.GetPatchJobRequest 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<PatchJobs.CancelPatchJobRequest, PatchJobs.PatchJob>
@@ -277,13 +269,10 @@ public Map<String, String> extract(PatchJobs.GetPatchJobRequest request) {
             GrpcCallSettings.<PatchJobs.CancelPatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(cancelPatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.CancelPatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.CancelPatchJobRequest 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<PatchJobs.ListPatchJobsRequest, PatchJobs.ListPatchJobsResponse>
@@ -292,13 +281,10 @@ public Map<String, String> extract(PatchJobs.CancelPatchJobRequest request) {
                 .<PatchJobs.ListPatchJobsRequest, PatchJobs.ListPatchJobsResponse>newBuilder()
                 .setMethodDescriptor(listPatchJobsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ListPatchJobsRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.ListPatchJobsRequest 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<
@@ -311,14 +297,10 @@ public Map<String, String> extract(PatchJobs.ListPatchJobsRequest request) {
                     newBuilder()
                 .setMethodDescriptor(listPatchJobInstanceDetailsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ListPatchJobInstanceDetailsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchJobs.ListPatchJobInstanceDetailsRequest 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<
@@ -329,14 +311,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(createPatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.CreatePatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.CreatePatchDeploymentRequest 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<PatchDeployments.GetPatchDeploymentRequest, PatchDeployments.PatchDeployment>
@@ -346,14 +324,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(getPatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.GetPatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.GetPatchDeploymentRequest 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<
@@ -366,14 +340,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(listPatchDeploymentsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.ListPatchDeploymentsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.ListPatchDeploymentsRequest 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<PatchDeployments.DeletePatchDeploymentRequest, Empty>
@@ -381,14 +351,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<PatchDeployments.DeletePatchDeploymentRequest, Empty>newBuilder()
                 .setMethodDescriptor(deletePatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.DeletePatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.DeletePatchDeploymentRequest 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-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/OsConfigServiceStubSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/OsConfigServiceStubSettings.java
index 94f78f7b..3a6e26b7 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/OsConfigServiceStubSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1/stub/OsConfigServiceStubSettings.java
@@ -688,14 +688,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-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java
index bbee35f3..bea51b3b 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.osconfig.v1alpha;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -2025,12 +2024,7 @@ public static ApiFuture<ListOSPolicyAssignmentsPagedResponse> createAsync(
           ListOSPolicyAssignmentsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListOSPolicyAssignmentsPage, ListOSPolicyAssignmentsPagedResponse>() {
-            @Override
-            public ListOSPolicyAssignmentsPagedResponse apply(ListOSPolicyAssignmentsPage input) {
-              return new ListOSPolicyAssignmentsPagedResponse(input);
-            }
-          },
+          input -> new ListOSPolicyAssignmentsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2121,14 +2115,7 @@ public static ApiFuture<ListOSPolicyAssignmentRevisionsPagedResponse> createAsyn
               .createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<
-              ListOSPolicyAssignmentRevisionsPage, ListOSPolicyAssignmentRevisionsPagedResponse>() {
-            @Override
-            public ListOSPolicyAssignmentRevisionsPagedResponse apply(
-                ListOSPolicyAssignmentRevisionsPage input) {
-              return new ListOSPolicyAssignmentRevisionsPagedResponse(input);
-            }
-          },
+          input -> new ListOSPolicyAssignmentRevisionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2225,15 +2212,7 @@ public static ApiFuture<ListInstanceOSPoliciesCompliancesPagedResponse> createAs
               .createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<
-              ListInstanceOSPoliciesCompliancesPage,
-              ListInstanceOSPoliciesCompliancesPagedResponse>() {
-            @Override
-            public ListInstanceOSPoliciesCompliancesPagedResponse apply(
-                ListInstanceOSPoliciesCompliancesPage input) {
-              return new ListInstanceOSPoliciesCompliancesPagedResponse(input);
-            }
-          },
+          input -> new ListInstanceOSPoliciesCompliancesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2326,12 +2305,7 @@ public static ApiFuture<ListInventoriesPagedResponse> createAsync(
           ListInventoriesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListInventoriesPage, ListInventoriesPagedResponse>() {
-            @Override
-            public ListInventoriesPagedResponse apply(ListInventoriesPage input) {
-              return new ListInventoriesPagedResponse(input);
-            }
-          },
+          input -> new ListInventoriesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2412,12 +2386,7 @@ public static ApiFuture<ListVulnerabilityReportsPagedResponse> createAsync(
           ListVulnerabilityReportsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListVulnerabilityReportsPage, ListVulnerabilityReportsPagedResponse>() {
-            @Override
-            public ListVulnerabilityReportsPagedResponse apply(ListVulnerabilityReportsPage input) {
-              return new ListVulnerabilityReportsPagedResponse(input);
-            }
-          },
+          input -> new ListVulnerabilityReportsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceSettings.java
index 1d204bc7..0549ab64 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/OsConfigZonalServiceSettings.java
@@ -279,14 +279,13 @@ public OsConfigZonalServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((OsConfigZonalServiceStubSettings.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-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/GrpcOsConfigZonalServiceStub.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/GrpcOsConfigZonalServiceStub.java
index 043c9c49..eb0ddbe1 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/GrpcOsConfigZonalServiceStub.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/GrpcOsConfigZonalServiceStub.java
@@ -29,7 +29,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.osconfig.v1alpha.CreateOSPolicyAssignmentRequest;
 import com.google.cloud.osconfig.v1alpha.DeleteOSPolicyAssignmentRequest;
@@ -60,7 +59,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;
 
@@ -324,13 +322,10 @@ protected GrpcOsConfigZonalServiceStub(
             GrpcCallSettings.<CreateOSPolicyAssignmentRequest, Operation>newBuilder()
                 .setMethodDescriptor(createOSPolicyAssignmentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateOSPolicyAssignmentRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateOSPolicyAssignmentRequest 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<UpdateOSPolicyAssignmentRequest, Operation>
@@ -338,15 +333,12 @@ public Map<String, String> extract(CreateOSPolicyAssignmentRequest request) {
             GrpcCallSettings.<UpdateOSPolicyAssignmentRequest, Operation>newBuilder()
                 .setMethodDescriptor(updateOSPolicyAssignmentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateOSPolicyAssignmentRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateOSPolicyAssignmentRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "os_policy_assignment.name",
-                            String.valueOf(request.getOsPolicyAssignment().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "os_policy_assignment.name",
+                          String.valueOf(request.getOsPolicyAssignment().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetOSPolicyAssignmentRequest, OSPolicyAssignment>
@@ -354,13 +346,10 @@ public Map<String, String> extract(UpdateOSPolicyAssignmentRequest request) {
             GrpcCallSettings.<GetOSPolicyAssignmentRequest, OSPolicyAssignment>newBuilder()
                 .setMethodDescriptor(getOSPolicyAssignmentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetOSPolicyAssignmentRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetOSPolicyAssignmentRequest 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<ListOSPolicyAssignmentsRequest, ListOSPolicyAssignmentsResponse>
@@ -369,13 +358,10 @@ public Map<String, String> extract(GetOSPolicyAssignmentRequest request) {
                 .<ListOSPolicyAssignmentsRequest, ListOSPolicyAssignmentsResponse>newBuilder()
                 .setMethodDescriptor(listOSPolicyAssignmentsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListOSPolicyAssignmentsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListOSPolicyAssignmentsRequest 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<
@@ -386,14 +372,10 @@ public Map<String, String> extract(ListOSPolicyAssignmentsRequest request) {
                     newBuilder()
                 .setMethodDescriptor(listOSPolicyAssignmentRevisionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListOSPolicyAssignmentRevisionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          ListOSPolicyAssignmentRevisionsRequest 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<DeleteOSPolicyAssignmentRequest, Operation>
@@ -401,13 +383,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<DeleteOSPolicyAssignmentRequest, Operation>newBuilder()
                 .setMethodDescriptor(deleteOSPolicyAssignmentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeleteOSPolicyAssignmentRequest>() {
-                      @Override
-                      public Map<String, String> extract(DeleteOSPolicyAssignmentRequest 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<GetInstanceOSPoliciesComplianceRequest, InstanceOSPoliciesCompliance>
@@ -416,14 +395,10 @@ public Map<String, String> extract(DeleteOSPolicyAssignmentRequest request) {
                 .<GetInstanceOSPoliciesComplianceRequest, InstanceOSPoliciesCompliance>newBuilder()
                 .setMethodDescriptor(getInstanceOSPoliciesComplianceMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetInstanceOSPoliciesComplianceRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GetInstanceOSPoliciesComplianceRequest 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<
@@ -435,27 +410,20 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(listInstanceOSPoliciesCompliancesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListInstanceOSPoliciesCompliancesRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          ListInstanceOSPoliciesCompliancesRequest 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<GetInventoryRequest, Inventory> getInventoryTransportSettings =
         GrpcCallSettings.<GetInventoryRequest, Inventory>newBuilder()
             .setMethodDescriptor(getInventoryMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetInventoryRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetInventoryRequest 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<ListInventoriesRequest, ListInventoriesResponse>
@@ -463,13 +431,10 @@ public Map<String, String> extract(GetInventoryRequest request) {
             GrpcCallSettings.<ListInventoriesRequest, ListInventoriesResponse>newBuilder()
                 .setMethodDescriptor(listInventoriesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListInventoriesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListInventoriesRequest 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<GetVulnerabilityReportRequest, VulnerabilityReport>
@@ -477,13 +442,10 @@ public Map<String, String> extract(ListInventoriesRequest request) {
             GrpcCallSettings.<GetVulnerabilityReportRequest, VulnerabilityReport>newBuilder()
                 .setMethodDescriptor(getVulnerabilityReportMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetVulnerabilityReportRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetVulnerabilityReportRequest 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<ListVulnerabilityReportsRequest, ListVulnerabilityReportsResponse>
@@ -492,13 +454,10 @@ public Map<String, String> extract(GetVulnerabilityReportRequest request) {
                 .<ListVulnerabilityReportsRequest, ListVulnerabilityReportsResponse>newBuilder()
                 .setMethodDescriptor(listVulnerabilityReportsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListVulnerabilityReportsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListVulnerabilityReportsRequest 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-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/OsConfigZonalServiceStubSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/OsConfigZonalServiceStubSettings.java
index 47cadda9..1440b8bd 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/OsConfigZonalServiceStubSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1alpha/stub/OsConfigZonalServiceStubSettings.java
@@ -1059,14 +1059,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-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceClient.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceClient.java
index d01d0ba9..a29e5451 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceClient.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.osconfig.v1beta;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1400,12 +1399,7 @@ public static ApiFuture<ListPatchJobsPagedResponse> createAsync(
           ListPatchJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPatchJobsPage, ListPatchJobsPagedResponse>() {
-            @Override
-            public ListPatchJobsPagedResponse apply(ListPatchJobsPage input) {
-              return new ListPatchJobsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchJobsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1495,14 +1489,7 @@ public static ApiFuture<ListPatchJobInstanceDetailsPagedResponse> createAsync(
               .createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<
-              ListPatchJobInstanceDetailsPage, ListPatchJobInstanceDetailsPagedResponse>() {
-            @Override
-            public ListPatchJobInstanceDetailsPagedResponse apply(
-                ListPatchJobInstanceDetailsPage input) {
-              return new ListPatchJobInstanceDetailsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchJobInstanceDetailsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1598,12 +1585,7 @@ public static ApiFuture<ListPatchDeploymentsPagedResponse> createAsync(
           ListPatchDeploymentsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListPatchDeploymentsPage, ListPatchDeploymentsPagedResponse>() {
-            @Override
-            public ListPatchDeploymentsPagedResponse apply(ListPatchDeploymentsPage input) {
-              return new ListPatchDeploymentsPagedResponse(input);
-            }
-          },
+          input -> new ListPatchDeploymentsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1699,12 +1681,7 @@ public static ApiFuture<ListGuestPoliciesPagedResponse> createAsync(
           ListGuestPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListGuestPoliciesPage, ListGuestPoliciesPagedResponse>() {
-            @Override
-            public ListGuestPoliciesPagedResponse apply(ListGuestPoliciesPage input) {
-              return new ListGuestPoliciesPagedResponse(input);
-            }
-          },
+          input -> new ListGuestPoliciesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceSettings.java
index 5c7833cc..943553f9 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/OsConfigServiceSettings.java
@@ -263,14 +263,13 @@ public OsConfigServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((OsConfigServiceStubSettings.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-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/GrpcOsConfigServiceStub.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/GrpcOsConfigServiceStub.java
index 3ab6ed80..b2e8c4d6 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/GrpcOsConfigServiceStub.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/GrpcOsConfigServiceStub.java
@@ -27,7 +27,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.osconfig.v1beta.GuestPolicies;
 import com.google.cloud.osconfig.v1beta.PatchDeployments;
@@ -38,7 +37,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -357,13 +355,10 @@ protected GrpcOsConfigServiceStub(
             GrpcCallSettings.<PatchJobs.ExecutePatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(executePatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ExecutePatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.ExecutePatchJobRequest 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<PatchJobs.GetPatchJobRequest, PatchJobs.PatchJob>
@@ -371,13 +366,10 @@ public Map<String, String> extract(PatchJobs.ExecutePatchJobRequest request) {
             GrpcCallSettings.<PatchJobs.GetPatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(getPatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.GetPatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.GetPatchJobRequest 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<PatchJobs.CancelPatchJobRequest, PatchJobs.PatchJob>
@@ -385,13 +377,10 @@ public Map<String, String> extract(PatchJobs.GetPatchJobRequest request) {
             GrpcCallSettings.<PatchJobs.CancelPatchJobRequest, PatchJobs.PatchJob>newBuilder()
                 .setMethodDescriptor(cancelPatchJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.CancelPatchJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.CancelPatchJobRequest 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<PatchJobs.ListPatchJobsRequest, PatchJobs.ListPatchJobsResponse>
@@ -400,13 +389,10 @@ public Map<String, String> extract(PatchJobs.CancelPatchJobRequest request) {
                 .<PatchJobs.ListPatchJobsRequest, PatchJobs.ListPatchJobsResponse>newBuilder()
                 .setMethodDescriptor(listPatchJobsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ListPatchJobsRequest>() {
-                      @Override
-                      public Map<String, String> extract(PatchJobs.ListPatchJobsRequest 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<
@@ -419,14 +405,10 @@ public Map<String, String> extract(PatchJobs.ListPatchJobsRequest request) {
                     newBuilder()
                 .setMethodDescriptor(listPatchJobInstanceDetailsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchJobs.ListPatchJobInstanceDetailsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchJobs.ListPatchJobInstanceDetailsRequest 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<
@@ -437,14 +419,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(createPatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.CreatePatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.CreatePatchDeploymentRequest 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<PatchDeployments.GetPatchDeploymentRequest, PatchDeployments.PatchDeployment>
@@ -454,14 +432,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(getPatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.GetPatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.GetPatchDeploymentRequest 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<
@@ -474,14 +448,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(listPatchDeploymentsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.ListPatchDeploymentsRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.ListPatchDeploymentsRequest 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<PatchDeployments.DeletePatchDeploymentRequest, Empty>
@@ -489,14 +459,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<PatchDeployments.DeletePatchDeploymentRequest, Empty>newBuilder()
                 .setMethodDescriptor(deletePatchDeploymentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<PatchDeployments.DeletePatchDeploymentRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          PatchDeployments.DeletePatchDeploymentRequest 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<GuestPolicies.CreateGuestPolicyRequest, GuestPolicies.GuestPolicy>
@@ -505,14 +471,10 @@ public Map<String, String> extract(
                 .<GuestPolicies.CreateGuestPolicyRequest, GuestPolicies.GuestPolicy>newBuilder()
                 .setMethodDescriptor(createGuestPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.CreateGuestPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.CreateGuestPolicyRequest 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<GuestPolicies.GetGuestPolicyRequest, GuestPolicies.GuestPolicy>
@@ -521,14 +483,10 @@ public Map<String, String> extract(
                 .<GuestPolicies.GetGuestPolicyRequest, GuestPolicies.GuestPolicy>newBuilder()
                 .setMethodDescriptor(getGuestPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.GetGuestPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.GetGuestPolicyRequest 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<
@@ -539,14 +497,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(listGuestPoliciesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.ListGuestPoliciesRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.ListGuestPoliciesRequest 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<GuestPolicies.UpdateGuestPolicyRequest, GuestPolicies.GuestPolicy>
@@ -555,16 +509,11 @@ public Map<String, String> extract(
                 .<GuestPolicies.UpdateGuestPolicyRequest, GuestPolicies.GuestPolicy>newBuilder()
                 .setMethodDescriptor(updateGuestPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.UpdateGuestPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.UpdateGuestPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put(
-                            "guest_policy.name",
-                            String.valueOf(request.getGuestPolicy().getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put(
+                          "guest_policy.name", String.valueOf(request.getGuestPolicy().getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GuestPolicies.DeleteGuestPolicyRequest, Empty>
@@ -572,14 +521,10 @@ public Map<String, String> extract(
             GrpcCallSettings.<GuestPolicies.DeleteGuestPolicyRequest, Empty>newBuilder()
                 .setMethodDescriptor(deleteGuestPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.DeleteGuestPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.DeleteGuestPolicyRequest 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<
@@ -591,14 +536,10 @@ public Map<String, String> extract(
                     newBuilder()
                 .setMethodDescriptor(lookupEffectiveGuestPolicyMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GuestPolicies.LookupEffectiveGuestPolicyRequest>() {
-                      @Override
-                      public Map<String, String> extract(
-                          GuestPolicies.LookupEffectiveGuestPolicyRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("instance", String.valueOf(request.getInstance()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("instance", String.valueOf(request.getInstance()));
+                      return params.build();
                     })
                 .build();
 
diff --git a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/OsConfigServiceStubSettings.java b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/OsConfigServiceStubSettings.java
index 1d2630e1..213d6aa0 100644
--- a/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/OsConfigServiceStubSettings.java
+++ b/google-cloud-os-config/src/main/java/com/google/cloud/osconfig/v1beta/stub/OsConfigServiceStubSettings.java
@@ -905,14 +905,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/proto-google-cloud-os-config-v1/clirr-ignored-differences.xml b/proto-google-cloud-os-config-v1/clirr-ignored-differences.xml
index 069d6dc0..a423cb3c 100644
--- a/proto-google-cloud-os-config-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-os-config-v1/clirr-ignored-differences.xml
@@ -16,4 +16,12 @@
     <className>com/google/cloud/osconfig/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/osconfig/v1/InstanceName</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/osconfig/v1/InstanceName$Builder</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-os-config-v1/src/main/java/com/google/cloud/osconfig/v1/InstanceName.java b/proto-google-cloud-os-config-v1/src/main/java/com/google/cloud/osconfig/v1/InstanceName.java
deleted file mode 100644
index 93637bf2..00000000
--- a/proto-google-cloud-os-config-v1/src/main/java/com/google/cloud/osconfig/v1/InstanceName.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.osconfig.v1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class InstanceName implements ResourceName {
-  private static final PathTemplate PROJECT_ZONE_INSTANCE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/zones/{zone}/instances/{instance}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String zone;
-  private final String instance;
-
-  @Deprecated
-  protected InstanceName() {
-    project = null;
-    zone = null;
-    instance = null;
-  }
-
-  private InstanceName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    zone = Preconditions.checkNotNull(builder.getZone());
-    instance = Preconditions.checkNotNull(builder.getInstance());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getZone() {
-    return zone;
-  }
-
-  public String getInstance() {
-    return instance;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static InstanceName of(String project, String zone, String instance) {
-    return newBuilder().setProject(project).setZone(zone).setInstance(instance).build();
-  }
-
-  public static String format(String project, String zone, String instance) {
-    return newBuilder().setProject(project).setZone(zone).setInstance(instance).build().toString();
-  }
-
-  public static InstanceName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_ZONE_INSTANCE.validatedMatch(
-            formattedString, "InstanceName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("zone"), matchMap.get("instance"));
-  }
-
-  public static List<InstanceName> parseList(List<String> formattedStrings) {
-    List<InstanceName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<InstanceName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (InstanceName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_ZONE_INSTANCE.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (zone != null) {
-            fieldMapBuilder.put("zone", zone);
-          }
-          if (instance != null) {
-            fieldMapBuilder.put("instance", instance);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_ZONE_INSTANCE.instantiate(
-        "project", project, "zone", zone, "instance", instance);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      InstanceName that = ((InstanceName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.zone, that.zone)
-          && Objects.equals(this.instance, that.instance);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(zone);
-    h *= 1000003;
-    h ^= Objects.hashCode(instance);
-    return h;
-  }
-
-  /** Builder for projects/{project}/zones/{zone}/instances/{instance}. */
-  public static class Builder {
-    private String project;
-    private String zone;
-    private String instance;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getZone() {
-      return zone;
-    }
-
-    public String getInstance() {
-      return instance;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setZone(String zone) {
-      this.zone = zone;
-      return this;
-    }
-
-    public Builder setInstance(String instance) {
-      this.instance = instance;
-      return this;
-    }
-
-    private Builder(InstanceName instanceName) {
-      this.project = instanceName.project;
-      this.zone = instanceName.zone;
-      this.instance = instanceName.instance;
-    }
-
-    public InstanceName build() {
-      return new InstanceName(this);
-    }
-  }
-}