diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
index ded64fc6..4e26dd40 100644
--- a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.dlp.v2;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -5251,12 +5250,7 @@ public static ApiFuture<ListInspectTemplatesPagedResponse> createAsync(
           ListInspectTemplatesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListInspectTemplatesPage, ListInspectTemplatesPagedResponse>() {
-            @Override
-            public ListInspectTemplatesPagedResponse apply(ListInspectTemplatesPage input) {
-              return new ListInspectTemplatesPagedResponse(input);
-            }
-          },
+          input -> new ListInspectTemplatesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -5341,12 +5335,7 @@ public static ApiFuture<ListDeidentifyTemplatesPagedResponse> createAsync(
           ListDeidentifyTemplatesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListDeidentifyTemplatesPage, ListDeidentifyTemplatesPagedResponse>() {
-            @Override
-            public ListDeidentifyTemplatesPagedResponse apply(ListDeidentifyTemplatesPage input) {
-              return new ListDeidentifyTemplatesPagedResponse(input);
-            }
-          },
+          input -> new ListDeidentifyTemplatesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -5432,12 +5421,7 @@ public static ApiFuture<ListJobTriggersPagedResponse> createAsync(
           ListJobTriggersPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListJobTriggersPage, ListJobTriggersPagedResponse>() {
-            @Override
-            public ListJobTriggersPagedResponse apply(ListJobTriggersPage input) {
-              return new ListJobTriggersPagedResponse(input);
-            }
-          },
+          input -> new ListJobTriggersPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -5513,14 +5497,7 @@ public static ApiFuture<ListDlpJobsPagedResponse> createAsync(
       ApiFuture<ListDlpJobsPage> futurePage =
           ListDlpJobsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListDlpJobsPage, ListDlpJobsPagedResponse>() {
-            @Override
-            public ListDlpJobsPagedResponse apply(ListDlpJobsPage input) {
-              return new ListDlpJobsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListDlpJobsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListDlpJobsPagedResponse(ListDlpJobsPage page) {
@@ -5595,12 +5572,7 @@ public static ApiFuture<ListStoredInfoTypesPagedResponse> createAsync(
           ListStoredInfoTypesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListStoredInfoTypesPage, ListStoredInfoTypesPagedResponse>() {
-            @Override
-            public ListStoredInfoTypesPagedResponse apply(ListStoredInfoTypesPage input) {
-              return new ListStoredInfoTypesPagedResponse(input);
-            }
-          },
+          input -> new ListStoredInfoTypesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
index 00e130f2..6ab59419 100644
--- a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
@@ -403,14 +403,13 @@ public DlpServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((DlpServiceStubSettings.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-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
index adf29532..abf3743a 100644
--- a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
@@ -1285,14 +1285,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-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java
index 2c9feec6..13c67c62 100644
--- a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.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.common.collect.ImmutableMap;
 import com.google.longrunning.stub.GrpcOperationsStub;
@@ -85,7 +84,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;
 
@@ -548,26 +546,20 @@ protected GrpcDlpServiceStub(
             GrpcCallSettings.<InspectContentRequest, InspectContentResponse>newBuilder()
                 .setMethodDescriptor(inspectContentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<InspectContentRequest>() {
-                      @Override
-                      public Map<String, String> extract(InspectContentRequest 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<RedactImageRequest, RedactImageResponse> redactImageTransportSettings =
         GrpcCallSettings.<RedactImageRequest, RedactImageResponse>newBuilder()
             .setMethodDescriptor(redactImageMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RedactImageRequest>() {
-                  @Override
-                  public Map<String, String> extract(RedactImageRequest 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<DeidentifyContentRequest, DeidentifyContentResponse>
@@ -575,13 +567,10 @@ public Map<String, String> extract(RedactImageRequest request) {
             GrpcCallSettings.<DeidentifyContentRequest, DeidentifyContentResponse>newBuilder()
                 .setMethodDescriptor(deidentifyContentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeidentifyContentRequest>() {
-                      @Override
-                      public Map<String, String> extract(DeidentifyContentRequest 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<ReidentifyContentRequest, ReidentifyContentResponse>
@@ -589,26 +578,20 @@ public Map<String, String> extract(DeidentifyContentRequest request) {
             GrpcCallSettings.<ReidentifyContentRequest, ReidentifyContentResponse>newBuilder()
                 .setMethodDescriptor(reidentifyContentMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ReidentifyContentRequest>() {
-                      @Override
-                      public Map<String, String> extract(ReidentifyContentRequest 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<ListInfoTypesRequest, ListInfoTypesResponse> listInfoTypesTransportSettings =
         GrpcCallSettings.<ListInfoTypesRequest, ListInfoTypesResponse>newBuilder()
             .setMethodDescriptor(listInfoTypesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListInfoTypesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListInfoTypesRequest 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<CreateInspectTemplateRequest, InspectTemplate>
@@ -616,13 +599,10 @@ public Map<String, String> extract(ListInfoTypesRequest request) {
             GrpcCallSettings.<CreateInspectTemplateRequest, InspectTemplate>newBuilder()
                 .setMethodDescriptor(createInspectTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateInspectTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateInspectTemplateRequest 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<UpdateInspectTemplateRequest, InspectTemplate>
@@ -630,13 +610,10 @@ public Map<String, String> extract(CreateInspectTemplateRequest request) {
             GrpcCallSettings.<UpdateInspectTemplateRequest, InspectTemplate>newBuilder()
                 .setMethodDescriptor(updateInspectTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateInspectTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateInspectTemplateRequest 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<GetInspectTemplateRequest, InspectTemplate>
@@ -644,13 +621,10 @@ public Map<String, String> extract(UpdateInspectTemplateRequest request) {
             GrpcCallSettings.<GetInspectTemplateRequest, InspectTemplate>newBuilder()
                 .setMethodDescriptor(getInspectTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetInspectTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetInspectTemplateRequest 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<ListInspectTemplatesRequest, ListInspectTemplatesResponse>
@@ -658,26 +632,20 @@ public Map<String, String> extract(GetInspectTemplateRequest request) {
             GrpcCallSettings.<ListInspectTemplatesRequest, ListInspectTemplatesResponse>newBuilder()
                 .setMethodDescriptor(listInspectTemplatesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListInspectTemplatesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListInspectTemplatesRequest 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<DeleteInspectTemplateRequest, Empty> deleteInspectTemplateTransportSettings =
         GrpcCallSettings.<DeleteInspectTemplateRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteInspectTemplateMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteInspectTemplateRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteInspectTemplateRequest 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<CreateDeidentifyTemplateRequest, DeidentifyTemplate>
@@ -685,13 +653,10 @@ public Map<String, String> extract(DeleteInspectTemplateRequest request) {
             GrpcCallSettings.<CreateDeidentifyTemplateRequest, DeidentifyTemplate>newBuilder()
                 .setMethodDescriptor(createDeidentifyTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateDeidentifyTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateDeidentifyTemplateRequest 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<UpdateDeidentifyTemplateRequest, DeidentifyTemplate>
@@ -699,13 +664,10 @@ public Map<String, String> extract(CreateDeidentifyTemplateRequest request) {
             GrpcCallSettings.<UpdateDeidentifyTemplateRequest, DeidentifyTemplate>newBuilder()
                 .setMethodDescriptor(updateDeidentifyTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateDeidentifyTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateDeidentifyTemplateRequest 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<GetDeidentifyTemplateRequest, DeidentifyTemplate>
@@ -713,13 +675,10 @@ public Map<String, String> extract(UpdateDeidentifyTemplateRequest request) {
             GrpcCallSettings.<GetDeidentifyTemplateRequest, DeidentifyTemplate>newBuilder()
                 .setMethodDescriptor(getDeidentifyTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<GetDeidentifyTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(GetDeidentifyTemplateRequest 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<ListDeidentifyTemplatesRequest, ListDeidentifyTemplatesResponse>
@@ -728,13 +687,10 @@ public Map<String, String> extract(GetDeidentifyTemplateRequest request) {
                 .<ListDeidentifyTemplatesRequest, ListDeidentifyTemplatesResponse>newBuilder()
                 .setMethodDescriptor(listDeidentifyTemplatesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListDeidentifyTemplatesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListDeidentifyTemplatesRequest 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<DeleteDeidentifyTemplateRequest, Empty>
@@ -742,39 +698,30 @@ public Map<String, String> extract(ListDeidentifyTemplatesRequest request) {
             GrpcCallSettings.<DeleteDeidentifyTemplateRequest, Empty>newBuilder()
                 .setMethodDescriptor(deleteDeidentifyTemplateMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DeleteDeidentifyTemplateRequest>() {
-                      @Override
-                      public Map<String, String> extract(DeleteDeidentifyTemplateRequest 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<CreateJobTriggerRequest, JobTrigger> createJobTriggerTransportSettings =
         GrpcCallSettings.<CreateJobTriggerRequest, JobTrigger>newBuilder()
             .setMethodDescriptor(createJobTriggerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateJobTriggerRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateJobTriggerRequest 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<UpdateJobTriggerRequest, JobTrigger> updateJobTriggerTransportSettings =
         GrpcCallSettings.<UpdateJobTriggerRequest, JobTrigger>newBuilder()
             .setMethodDescriptor(updateJobTriggerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateJobTriggerRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateJobTriggerRequest 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<HybridInspectJobTriggerRequest, HybridInspectResponse>
@@ -782,26 +729,20 @@ public Map<String, String> extract(UpdateJobTriggerRequest request) {
             GrpcCallSettings.<HybridInspectJobTriggerRequest, HybridInspectResponse>newBuilder()
                 .setMethodDescriptor(hybridInspectJobTriggerMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<HybridInspectJobTriggerRequest>() {
-                      @Override
-                      public Map<String, String> extract(HybridInspectJobTriggerRequest 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<GetJobTriggerRequest, JobTrigger> getJobTriggerTransportSettings =
         GrpcCallSettings.<GetJobTriggerRequest, JobTrigger>newBuilder()
             .setMethodDescriptor(getJobTriggerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetJobTriggerRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetJobTriggerRequest 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<ListJobTriggersRequest, ListJobTriggersResponse>
@@ -809,104 +750,80 @@ public Map<String, String> extract(GetJobTriggerRequest request) {
             GrpcCallSettings.<ListJobTriggersRequest, ListJobTriggersResponse>newBuilder()
                 .setMethodDescriptor(listJobTriggersMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListJobTriggersRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListJobTriggersRequest 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<DeleteJobTriggerRequest, Empty> deleteJobTriggerTransportSettings =
         GrpcCallSettings.<DeleteJobTriggerRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteJobTriggerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteJobTriggerRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteJobTriggerRequest 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<ActivateJobTriggerRequest, DlpJob> activateJobTriggerTransportSettings =
         GrpcCallSettings.<ActivateJobTriggerRequest, DlpJob>newBuilder()
             .setMethodDescriptor(activateJobTriggerMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ActivateJobTriggerRequest>() {
-                  @Override
-                  public Map<String, String> extract(ActivateJobTriggerRequest 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<CreateDlpJobRequest, DlpJob> createDlpJobTransportSettings =
         GrpcCallSettings.<CreateDlpJobRequest, DlpJob>newBuilder()
             .setMethodDescriptor(createDlpJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateDlpJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateDlpJobRequest 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<ListDlpJobsRequest, ListDlpJobsResponse> listDlpJobsTransportSettings =
         GrpcCallSettings.<ListDlpJobsRequest, ListDlpJobsResponse>newBuilder()
             .setMethodDescriptor(listDlpJobsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListDlpJobsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListDlpJobsRequest 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<GetDlpJobRequest, DlpJob> getDlpJobTransportSettings =
         GrpcCallSettings.<GetDlpJobRequest, DlpJob>newBuilder()
             .setMethodDescriptor(getDlpJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetDlpJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetDlpJobRequest 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<DeleteDlpJobRequest, Empty> deleteDlpJobTransportSettings =
         GrpcCallSettings.<DeleteDlpJobRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteDlpJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteDlpJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteDlpJobRequest 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<CancelDlpJobRequest, Empty> cancelDlpJobTransportSettings =
         GrpcCallSettings.<CancelDlpJobRequest, Empty>newBuilder()
             .setMethodDescriptor(cancelDlpJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CancelDlpJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(CancelDlpJobRequest 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<CreateStoredInfoTypeRequest, StoredInfoType>
@@ -914,13 +831,10 @@ public Map<String, String> extract(CancelDlpJobRequest request) {
             GrpcCallSettings.<CreateStoredInfoTypeRequest, StoredInfoType>newBuilder()
                 .setMethodDescriptor(createStoredInfoTypeMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<CreateStoredInfoTypeRequest>() {
-                      @Override
-                      public Map<String, String> extract(CreateStoredInfoTypeRequest 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<UpdateStoredInfoTypeRequest, StoredInfoType>
@@ -928,26 +842,20 @@ public Map<String, String> extract(CreateStoredInfoTypeRequest request) {
             GrpcCallSettings.<UpdateStoredInfoTypeRequest, StoredInfoType>newBuilder()
                 .setMethodDescriptor(updateStoredInfoTypeMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<UpdateStoredInfoTypeRequest>() {
-                      @Override
-                      public Map<String, String> extract(UpdateStoredInfoTypeRequest 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<GetStoredInfoTypeRequest, StoredInfoType> getStoredInfoTypeTransportSettings =
         GrpcCallSettings.<GetStoredInfoTypeRequest, StoredInfoType>newBuilder()
             .setMethodDescriptor(getStoredInfoTypeMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetStoredInfoTypeRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetStoredInfoTypeRequest 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<ListStoredInfoTypesRequest, ListStoredInfoTypesResponse>
@@ -955,26 +863,20 @@ public Map<String, String> extract(GetStoredInfoTypeRequest request) {
             GrpcCallSettings.<ListStoredInfoTypesRequest, ListStoredInfoTypesResponse>newBuilder()
                 .setMethodDescriptor(listStoredInfoTypesMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListStoredInfoTypesRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListStoredInfoTypesRequest 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<DeleteStoredInfoTypeRequest, Empty> deleteStoredInfoTypeTransportSettings =
         GrpcCallSettings.<DeleteStoredInfoTypeRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteStoredInfoTypeMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteStoredInfoTypeRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteStoredInfoTypeRequest 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<HybridInspectDlpJobRequest, HybridInspectResponse>
@@ -982,26 +884,20 @@ public Map<String, String> extract(DeleteStoredInfoTypeRequest request) {
             GrpcCallSettings.<HybridInspectDlpJobRequest, HybridInspectResponse>newBuilder()
                 .setMethodDescriptor(hybridInspectDlpJobMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<HybridInspectDlpJobRequest>() {
-                      @Override
-                      public Map<String, String> extract(HybridInspectDlpJobRequest 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<FinishDlpJobRequest, Empty> finishDlpJobTransportSettings =
         GrpcCallSettings.<FinishDlpJobRequest, Empty>newBuilder()
             .setMethodDescriptor(finishDlpJobMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<FinishDlpJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(FinishDlpJobRequest 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();
 
@@ -1390,7 +1286,13 @@ public UnaryCallable<FinishDlpJobRequest, Empty> finishDlpJobCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/proto-google-cloud-dlp-v2/clirr-ignored-differences.xml b/proto-google-cloud-dlp-v2/clirr-ignored-differences.xml
index ed836ae7..a604330a 100644
--- a/proto-google-cloud-dlp-v2/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dlp-v2/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/privacy/dlp/v2/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/privacy/dlp/v2/Finding*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FindingName.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FindingName.java
deleted file mode 100644
index 6d123762..00000000
--- a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FindingName.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.privacy.dlp.v2;
-
-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 FindingName implements ResourceName {
-  private static final PathTemplate PROJECT_LOCATION_FINDING =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/locations/{location}/findings/{finding}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String location;
-  private final String finding;
-
-  @Deprecated
-  protected FindingName() {
-    project = null;
-    location = null;
-    finding = null;
-  }
-
-  private FindingName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    location = Preconditions.checkNotNull(builder.getLocation());
-    finding = Preconditions.checkNotNull(builder.getFinding());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getFinding() {
-    return finding;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static FindingName of(String project, String location, String finding) {
-    return newBuilder().setProject(project).setLocation(location).setFinding(finding).build();
-  }
-
-  public static String format(String project, String location, String finding) {
-    return newBuilder()
-        .setProject(project)
-        .setLocation(location)
-        .setFinding(finding)
-        .build()
-        .toString();
-  }
-
-  public static FindingName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_LOCATION_FINDING.validatedMatch(
-            formattedString, "FindingName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("finding"));
-  }
-
-  public static List<FindingName> parseList(List<String> formattedStrings) {
-    List<FindingName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<FindingName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (FindingName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_LOCATION_FINDING.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (location != null) {
-            fieldMapBuilder.put("location", location);
-          }
-          if (finding != null) {
-            fieldMapBuilder.put("finding", finding);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_LOCATION_FINDING.instantiate(
-        "project", project, "location", location, "finding", finding);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      FindingName that = ((FindingName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.location, that.location)
-          && Objects.equals(this.finding, that.finding);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(location);
-    h *= 1000003;
-    h ^= Objects.hashCode(finding);
-    return h;
-  }
-
-  /** Builder for projects/{project}/locations/{location}/findings/{finding}. */
-  public static class Builder {
-    private String project;
-    private String location;
-    private String finding;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getLocation() {
-      return location;
-    }
-
-    public String getFinding() {
-      return finding;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setLocation(String location) {
-      this.location = location;
-      return this;
-    }
-
-    public Builder setFinding(String finding) {
-      this.finding = finding;
-      return this;
-    }
-
-    private Builder(FindingName findingName) {
-      this.project = findingName.project;
-      this.location = findingName.location;
-      this.finding = findingName.finding;
-    }
-
-    public FindingName build() {
-      return new FindingName(this);
-    }
-  }
-}
diff --git a/synth.metadata b/synth.metadata
index e17b8102..088adb87 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48",
+        "internalRef": "388535346"
       }
     },
     {
@@ -227,7 +227,6 @@
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformationOrBuilder.java",
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FileType.java",
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java",
-    "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FindingName.java",
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FindingOrBuilder.java",
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FinishDlpJobRequest.java",
     "proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FinishDlpJobRequestOrBuilder.java",