From 9d4e3f6079fbcfb8f7c21851a53549147658b5a7 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 6 Aug 2021 18:12:25 +0000
Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#86)

Committer: @miraleung
PiperOrigin-RevId: 388535346

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

Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
---
 .../metastore/v1/DataprocMetastoreClient.java |  15 +-
 .../v1/DataprocMetastoreSettings.java         |   3 +-
 .../stub/DataprocMetastoreStubSettings.java   |   3 +-
 .../v1/stub/GrpcDataprocMetastoreStub.java    | 116 ++++-------
 .../v1alpha/DataprocMetastoreClient.java      |  24 +--
 .../v1alpha/DataprocMetastoreSettings.java    |   3 +-
 .../stub/DataprocMetastoreStubSettings.java   |   3 +-
 .../stub/GrpcDataprocMetastoreStub.java       | 171 ++++++----------
 .../v1beta/DataprocMetastoreClient.java       |  24 +--
 .../v1beta/DataprocMetastoreSettings.java     |   3 +-
 .../stub/DataprocMetastoreStubSettings.java   |   3 +-
 .../stub/GrpcDataprocMetastoreStub.java       | 171 ++++++----------
 .../v1/DataprocMetastoreClientTest.java       |  10 +-
 .../v1alpha/DataprocMetastoreClientTest.java  |  10 +-
 .../v1beta/DataprocMetastoreClientTest.java   |  10 +-
 .../clirr-ignored-differences.xml             |   4 +
 .../cloud/metastore/v1/NetworkName.java       | 192 ------------------
 .../clirr-ignored-differences.xml             |   4 +
 .../cloud/metastore/v1alpha/NetworkName.java  | 192 ------------------
 .../clirr-ignored-differences.xml             |   4 +
 .../cloud/metastore/v1beta/NetworkName.java   | 192 ------------------
 21 files changed, 207 insertions(+), 950 deletions(-)
 delete mode 100644 proto-google-cloud-dataproc-metastore-v1/src/main/java/com/google/cloud/metastore/v1/NetworkName.java
 delete mode 100644 proto-google-cloud-dataproc-metastore-v1alpha/src/main/java/com/google/cloud/metastore/v1alpha/NetworkName.java
 delete mode 100644 proto-google-cloud-dataproc-metastore-v1beta/src/main/java/com/google/cloud/metastore/v1beta/NetworkName.java

diff --git a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreClient.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreClient.java
index ae665c33..bc14da3e 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreClient.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.metastore.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;
@@ -1462,12 +1461,7 @@ public static ApiFuture<ListServicesPagedResponse> createAsync(
           ListServicesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListServicesPage, ListServicesPagedResponse>() {
-            @Override
-            public ListServicesPagedResponse apply(ListServicesPage input) {
-              return new ListServicesPagedResponse(input);
-            }
-          },
+          input -> new ListServicesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -1543,12 +1537,7 @@ public static ApiFuture<ListMetadataImportsPagedResponse> createAsync(
           ListMetadataImportsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListMetadataImportsPage, ListMetadataImportsPagedResponse>() {
-            @Override
-            public ListMetadataImportsPagedResponse apply(ListMetadataImportsPage input) {
-              return new ListMetadataImportsPagedResponse(input);
-            }
-          },
+          input -> new ListMetadataImportsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreSettings.java
index fdd959e0..bbe115bd 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/DataprocMetastoreSettings.java
@@ -249,14 +249,13 @@ public DataprocMetastoreStubSettings.Builder getStubSettingsBuilder() {
       return ((DataprocMetastoreStubSettings.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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/DataprocMetastoreStubSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/DataprocMetastoreStubSettings.java
index e3467677..16a548b6 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/DataprocMetastoreStubSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/DataprocMetastoreStubSettings.java
@@ -806,14 +806,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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/GrpcDataprocMetastoreStub.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/GrpcDataprocMetastoreStub.java
index 7d0ad3dc..c0282605 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/GrpcDataprocMetastoreStub.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1/stub/GrpcDataprocMetastoreStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.metastore.v1.CreateMetadataImportRequest;
 import com.google.cloud.metastore.v1.CreateServiceRequest;
@@ -50,7 +49,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;
 
@@ -237,65 +235,50 @@ protected GrpcDataprocMetastoreStub(
         GrpcCallSettings.<ListServicesRequest, ListServicesResponse>newBuilder()
             .setMethodDescriptor(listServicesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListServicesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListServicesRequest 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<GetServiceRequest, Service> getServiceTransportSettings =
         GrpcCallSettings.<GetServiceRequest, Service>newBuilder()
             .setMethodDescriptor(getServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetServiceRequest 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<CreateServiceRequest, Operation> createServiceTransportSettings =
         GrpcCallSettings.<CreateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(createServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateServiceRequest 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<UpdateServiceRequest, Operation> updateServiceTransportSettings =
         GrpcCallSettings.<UpdateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(updateServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service.name", String.valueOf(request.getService().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service.name", String.valueOf(request.getService().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteServiceRequest, Operation> deleteServiceTransportSettings =
         GrpcCallSettings.<DeleteServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteServiceRequest 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<ListMetadataImportsRequest, ListMetadataImportsResponse>
@@ -303,67 +286,52 @@ public Map<String, String> extract(DeleteServiceRequest request) {
             GrpcCallSettings.<ListMetadataImportsRequest, ListMetadataImportsResponse>newBuilder()
                 .setMethodDescriptor(listMetadataImportsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListMetadataImportsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListMetadataImportsRequest 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<GetMetadataImportRequest, MetadataImport> getMetadataImportTransportSettings =
         GrpcCallSettings.<GetMetadataImportRequest, MetadataImport>newBuilder()
             .setMethodDescriptor(getMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetMetadataImportRequest 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<CreateMetadataImportRequest, Operation> createMetadataImportTransportSettings =
         GrpcCallSettings.<CreateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(createMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateMetadataImportRequest 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<UpdateMetadataImportRequest, Operation> updateMetadataImportTransportSettings =
         GrpcCallSettings.<UpdateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(updateMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateMetadataImportRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "metadata_import.name",
-                        String.valueOf(request.getMetadataImport().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put(
+                      "metadata_import.name",
+                      String.valueOf(request.getMetadataImport().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ExportMetadataRequest, Operation> exportMetadataTransportSettings =
         GrpcCallSettings.<ExportMetadataRequest, Operation>newBuilder()
             .setMethodDescriptor(exportMetadataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportMetadataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportMetadataRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service", String.valueOf(request.getService()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service", String.valueOf(request.getService()));
+                  return params.build();
                 })
             .build();
 
diff --git a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClient.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClient.java
index bf0971ff..2e0b551b 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClient.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.metastore.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;
@@ -2182,12 +2181,7 @@ public static ApiFuture<ListServicesPagedResponse> createAsync(
           ListServicesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListServicesPage, ListServicesPagedResponse>() {
-            @Override
-            public ListServicesPagedResponse apply(ListServicesPage input) {
-              return new ListServicesPagedResponse(input);
-            }
-          },
+          input -> new ListServicesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2263,12 +2257,7 @@ public static ApiFuture<ListMetadataImportsPagedResponse> createAsync(
           ListMetadataImportsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListMetadataImportsPage, ListMetadataImportsPagedResponse>() {
-            @Override
-            public ListMetadataImportsPagedResponse apply(ListMetadataImportsPage input) {
-              return new ListMetadataImportsPagedResponse(input);
-            }
-          },
+          input -> new ListMetadataImportsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2350,14 +2339,7 @@ public static ApiFuture<ListBackupsPagedResponse> createAsync(
       ApiFuture<ListBackupsPage> futurePage =
           ListBackupsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListBackupsPage, ListBackupsPagedResponse>() {
-            @Override
-            public ListBackupsPagedResponse apply(ListBackupsPage input) {
-              return new ListBackupsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListBackupsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListBackupsPagedResponse(ListBackupsPage page) {
diff --git a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreSettings.java
index 108479de..7343d818 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreSettings.java
@@ -295,14 +295,13 @@ public DataprocMetastoreStubSettings.Builder getStubSettingsBuilder() {
       return ((DataprocMetastoreStubSettings.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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/DataprocMetastoreStubSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/DataprocMetastoreStubSettings.java
index 74d451d6..ca2ea6ae 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/DataprocMetastoreStubSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/DataprocMetastoreStubSettings.java
@@ -1070,14 +1070,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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/GrpcDataprocMetastoreStub.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/GrpcDataprocMetastoreStub.java
index b6f69ed9..b747bd0a 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/GrpcDataprocMetastoreStub.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1alpha/stub/GrpcDataprocMetastoreStub.java
@@ -27,7 +27,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.metastore.v1alpha.Backup;
 import com.google.cloud.metastore.v1alpha.CreateBackupRequest;
@@ -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;
 
@@ -311,65 +309,50 @@ protected GrpcDataprocMetastoreStub(
         GrpcCallSettings.<ListServicesRequest, ListServicesResponse>newBuilder()
             .setMethodDescriptor(listServicesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListServicesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListServicesRequest 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<GetServiceRequest, Service> getServiceTransportSettings =
         GrpcCallSettings.<GetServiceRequest, Service>newBuilder()
             .setMethodDescriptor(getServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetServiceRequest 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<CreateServiceRequest, Operation> createServiceTransportSettings =
         GrpcCallSettings.<CreateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(createServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateServiceRequest 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<UpdateServiceRequest, Operation> updateServiceTransportSettings =
         GrpcCallSettings.<UpdateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(updateServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service.name", String.valueOf(request.getService().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service.name", String.valueOf(request.getService().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteServiceRequest, Operation> deleteServiceTransportSettings =
         GrpcCallSettings.<DeleteServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteServiceRequest 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<ListMetadataImportsRequest, ListMetadataImportsResponse>
@@ -377,132 +360,102 @@ public Map<String, String> extract(DeleteServiceRequest request) {
             GrpcCallSettings.<ListMetadataImportsRequest, ListMetadataImportsResponse>newBuilder()
                 .setMethodDescriptor(listMetadataImportsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListMetadataImportsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListMetadataImportsRequest 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<GetMetadataImportRequest, MetadataImport> getMetadataImportTransportSettings =
         GrpcCallSettings.<GetMetadataImportRequest, MetadataImport>newBuilder()
             .setMethodDescriptor(getMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetMetadataImportRequest 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<CreateMetadataImportRequest, Operation> createMetadataImportTransportSettings =
         GrpcCallSettings.<CreateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(createMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateMetadataImportRequest 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<UpdateMetadataImportRequest, Operation> updateMetadataImportTransportSettings =
         GrpcCallSettings.<UpdateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(updateMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateMetadataImportRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "metadata_import.name",
-                        String.valueOf(request.getMetadataImport().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put(
+                      "metadata_import.name",
+                      String.valueOf(request.getMetadataImport().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ExportMetadataRequest, Operation> exportMetadataTransportSettings =
         GrpcCallSettings.<ExportMetadataRequest, Operation>newBuilder()
             .setMethodDescriptor(exportMetadataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportMetadataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportMetadataRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service", String.valueOf(request.getService()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service", String.valueOf(request.getService()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RestoreServiceRequest, Operation> restoreServiceTransportSettings =
         GrpcCallSettings.<RestoreServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(restoreServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RestoreServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(RestoreServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service", String.valueOf(request.getService()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service", String.valueOf(request.getService()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListBackupsRequest, ListBackupsResponse> listBackupsTransportSettings =
         GrpcCallSettings.<ListBackupsRequest, ListBackupsResponse>newBuilder()
             .setMethodDescriptor(listBackupsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListBackupsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListBackupsRequest 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<GetBackupRequest, Backup> getBackupTransportSettings =
         GrpcCallSettings.<GetBackupRequest, Backup>newBuilder()
             .setMethodDescriptor(getBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetBackupRequest 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<CreateBackupRequest, Operation> createBackupTransportSettings =
         GrpcCallSettings.<CreateBackupRequest, Operation>newBuilder()
             .setMethodDescriptor(createBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateBackupRequest 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<DeleteBackupRequest, Operation> deleteBackupTransportSettings =
         GrpcCallSettings.<DeleteBackupRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteBackupRequest 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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClient.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClient.java
index 60c7e046..e3a00dad 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClient.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.metastore.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;
@@ -2182,12 +2181,7 @@ public static ApiFuture<ListServicesPagedResponse> createAsync(
           ListServicesPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListServicesPage, ListServicesPagedResponse>() {
-            @Override
-            public ListServicesPagedResponse apply(ListServicesPage input) {
-              return new ListServicesPagedResponse(input);
-            }
-          },
+          input -> new ListServicesPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2263,12 +2257,7 @@ public static ApiFuture<ListMetadataImportsPagedResponse> createAsync(
           ListMetadataImportsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListMetadataImportsPage, ListMetadataImportsPagedResponse>() {
-            @Override
-            public ListMetadataImportsPagedResponse apply(ListMetadataImportsPage input) {
-              return new ListMetadataImportsPagedResponse(input);
-            }
-          },
+          input -> new ListMetadataImportsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
@@ -2350,14 +2339,7 @@ public static ApiFuture<ListBackupsPagedResponse> createAsync(
       ApiFuture<ListBackupsPage> futurePage =
           ListBackupsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListBackupsPage, ListBackupsPagedResponse>() {
-            @Override
-            public ListBackupsPagedResponse apply(ListBackupsPage input) {
-              return new ListBackupsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListBackupsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListBackupsPagedResponse(ListBackupsPage page) {
diff --git a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreSettings.java
index 569b72ca..9b069482 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/DataprocMetastoreSettings.java
@@ -295,14 +295,13 @@ public DataprocMetastoreStubSettings.Builder getStubSettingsBuilder() {
       return ((DataprocMetastoreStubSettings.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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/DataprocMetastoreStubSettings.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/DataprocMetastoreStubSettings.java
index 4b0ac35e..4239a99b 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/DataprocMetastoreStubSettings.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/DataprocMetastoreStubSettings.java
@@ -1070,14 +1070,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-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/GrpcDataprocMetastoreStub.java b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/GrpcDataprocMetastoreStub.java
index 2395cb0a..b9a547e3 100644
--- a/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/GrpcDataprocMetastoreStub.java
+++ b/google-cloud-dataproc-metastore/src/main/java/com/google/cloud/metastore/v1beta/stub/GrpcDataprocMetastoreStub.java
@@ -27,7 +27,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.metastore.v1beta.Backup;
 import com.google.cloud.metastore.v1beta.CreateBackupRequest;
@@ -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;
 
@@ -311,65 +309,50 @@ protected GrpcDataprocMetastoreStub(
         GrpcCallSettings.<ListServicesRequest, ListServicesResponse>newBuilder()
             .setMethodDescriptor(listServicesMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListServicesRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListServicesRequest 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<GetServiceRequest, Service> getServiceTransportSettings =
         GrpcCallSettings.<GetServiceRequest, Service>newBuilder()
             .setMethodDescriptor(getServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetServiceRequest 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<CreateServiceRequest, Operation> createServiceTransportSettings =
         GrpcCallSettings.<CreateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(createServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateServiceRequest 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<UpdateServiceRequest, Operation> updateServiceTransportSettings =
         GrpcCallSettings.<UpdateServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(updateServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service.name", String.valueOf(request.getService().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service.name", String.valueOf(request.getService().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteServiceRequest, Operation> deleteServiceTransportSettings =
         GrpcCallSettings.<DeleteServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteServiceRequest 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<ListMetadataImportsRequest, ListMetadataImportsResponse>
@@ -377,132 +360,102 @@ public Map<String, String> extract(DeleteServiceRequest request) {
             GrpcCallSettings.<ListMetadataImportsRequest, ListMetadataImportsResponse>newBuilder()
                 .setMethodDescriptor(listMetadataImportsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListMetadataImportsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListMetadataImportsRequest 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<GetMetadataImportRequest, MetadataImport> getMetadataImportTransportSettings =
         GrpcCallSettings.<GetMetadataImportRequest, MetadataImport>newBuilder()
             .setMethodDescriptor(getMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetMetadataImportRequest 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<CreateMetadataImportRequest, Operation> createMetadataImportTransportSettings =
         GrpcCallSettings.<CreateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(createMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateMetadataImportRequest 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<UpdateMetadataImportRequest, Operation> updateMetadataImportTransportSettings =
         GrpcCallSettings.<UpdateMetadataImportRequest, Operation>newBuilder()
             .setMethodDescriptor(updateMetadataImportMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateMetadataImportRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateMetadataImportRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put(
-                        "metadata_import.name",
-                        String.valueOf(request.getMetadataImport().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put(
+                      "metadata_import.name",
+                      String.valueOf(request.getMetadataImport().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ExportMetadataRequest, Operation> exportMetadataTransportSettings =
         GrpcCallSettings.<ExportMetadataRequest, Operation>newBuilder()
             .setMethodDescriptor(exportMetadataMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ExportMetadataRequest>() {
-                  @Override
-                  public Map<String, String> extract(ExportMetadataRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service", String.valueOf(request.getService()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service", String.valueOf(request.getService()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<RestoreServiceRequest, Operation> restoreServiceTransportSettings =
         GrpcCallSettings.<RestoreServiceRequest, Operation>newBuilder()
             .setMethodDescriptor(restoreServiceMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<RestoreServiceRequest>() {
-                  @Override
-                  public Map<String, String> extract(RestoreServiceRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("service", String.valueOf(request.getService()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("service", String.valueOf(request.getService()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListBackupsRequest, ListBackupsResponse> listBackupsTransportSettings =
         GrpcCallSettings.<ListBackupsRequest, ListBackupsResponse>newBuilder()
             .setMethodDescriptor(listBackupsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListBackupsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListBackupsRequest 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<GetBackupRequest, Backup> getBackupTransportSettings =
         GrpcCallSettings.<GetBackupRequest, Backup>newBuilder()
             .setMethodDescriptor(getBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetBackupRequest 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<CreateBackupRequest, Operation> createBackupTransportSettings =
         GrpcCallSettings.<CreateBackupRequest, Operation>newBuilder()
             .setMethodDescriptor(createBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateBackupRequest 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<DeleteBackupRequest, Operation> deleteBackupTransportSettings =
         GrpcCallSettings.<DeleteBackupRequest, Operation>newBuilder()
             .setMethodDescriptor(deleteBackupMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteBackupRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteBackupRequest 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-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1/DataprocMetastoreClientTest.java b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1/DataprocMetastoreClientTest.java
index 22220088..85b557ed 100644
--- a/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1/DataprocMetastoreClientTest.java
+++ b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1/DataprocMetastoreClientTest.java
@@ -183,7 +183,7 @@ public void getServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -232,7 +232,7 @@ public void getServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -281,7 +281,7 @@ public void createServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -344,7 +344,7 @@ public void createServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -407,7 +407,7 @@ public void updateServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
diff --git a/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClientTest.java b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClientTest.java
index e50f2dc3..55a8a4a2 100644
--- a/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClientTest.java
+++ b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1alpha/DataprocMetastoreClientTest.java
@@ -184,7 +184,7 @@ public void getServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -234,7 +234,7 @@ public void getServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -284,7 +284,7 @@ public void createServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -348,7 +348,7 @@ public void createServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -412,7 +412,7 @@ public void updateServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
diff --git a/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClientTest.java b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClientTest.java
index 75d62c1a..be5378f9 100644
--- a/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClientTest.java
+++ b/google-cloud-dataproc-metastore/src/test/java/com/google/cloud/metastore/v1beta/DataprocMetastoreClientTest.java
@@ -184,7 +184,7 @@ public void getServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -234,7 +234,7 @@ public void getServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -284,7 +284,7 @@ public void createServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -348,7 +348,7 @@ public void createServiceTest2() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
@@ -412,7 +412,7 @@ public void updateServiceTest() throws Exception {
             .setCreateTime(Timestamp.newBuilder().build())
             .setUpdateTime(Timestamp.newBuilder().build())
             .putAllLabels(new HashMap<String, String>())
-            .setNetwork(NetworkName.of("[PROJECT]", "[NETWORK]").toString())
+            .setNetwork("network1843485230")
             .setEndpointUri("endpointUri-1135817833")
             .setPort(3446913)
             .setStateMessage("stateMessage1128185398")
diff --git a/proto-google-cloud-dataproc-metastore-v1/clirr-ignored-differences.xml b/proto-google-cloud-dataproc-metastore-v1/clirr-ignored-differences.xml
index a630a315..aa42791b 100644
--- a/proto-google-cloud-dataproc-metastore-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dataproc-metastore-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/metastore/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/metastore/v1/Network*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dataproc-metastore-v1/src/main/java/com/google/cloud/metastore/v1/NetworkName.java b/proto-google-cloud-dataproc-metastore-v1/src/main/java/com/google/cloud/metastore/v1/NetworkName.java
deleted file mode 100644
index d2b8e57f..00000000
--- a/proto-google-cloud-dataproc-metastore-v1/src/main/java/com/google/cloud/metastore/v1/NetworkName.java
+++ /dev/null
@@ -1,192 +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.metastore.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 NetworkName implements ResourceName {
-  private static final PathTemplate PROJECT_NETWORK =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/global/networks/{network}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String network;
-
-  @Deprecated
-  protected NetworkName() {
-    project = null;
-    network = null;
-  }
-
-  private NetworkName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    network = Preconditions.checkNotNull(builder.getNetwork());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getNetwork() {
-    return network;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static NetworkName of(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build();
-  }
-
-  public static String format(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build().toString();
-  }
-
-  public static NetworkName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_NETWORK.validatedMatch(
-            formattedString, "NetworkName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("network"));
-  }
-
-  public static List<NetworkName> parseList(List<String> formattedStrings) {
-    List<NetworkName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<NetworkName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (NetworkName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_NETWORK.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 (network != null) {
-            fieldMapBuilder.put("network", network);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_NETWORK.instantiate("project", project, "network", network);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      NetworkName that = ((NetworkName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.network, that.network);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(network);
-    return h;
-  }
-
-  /** Builder for projects/{project}/global/networks/{network}. */
-  public static class Builder {
-    private String project;
-    private String network;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getNetwork() {
-      return network;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setNetwork(String network) {
-      this.network = network;
-      return this;
-    }
-
-    private Builder(NetworkName networkName) {
-      this.project = networkName.project;
-      this.network = networkName.network;
-    }
-
-    public NetworkName build() {
-      return new NetworkName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-dataproc-metastore-v1alpha/clirr-ignored-differences.xml b/proto-google-cloud-dataproc-metastore-v1alpha/clirr-ignored-differences.xml
index f030be76..89570ecd 100644
--- a/proto-google-cloud-dataproc-metastore-v1alpha/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dataproc-metastore-v1alpha/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/metastore/v1alpha/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/metastore/v1alpha/Network*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dataproc-metastore-v1alpha/src/main/java/com/google/cloud/metastore/v1alpha/NetworkName.java b/proto-google-cloud-dataproc-metastore-v1alpha/src/main/java/com/google/cloud/metastore/v1alpha/NetworkName.java
deleted file mode 100644
index 839c802c..00000000
--- a/proto-google-cloud-dataproc-metastore-v1alpha/src/main/java/com/google/cloud/metastore/v1alpha/NetworkName.java
+++ /dev/null
@@ -1,192 +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.metastore.v1alpha;
-
-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 NetworkName implements ResourceName {
-  private static final PathTemplate PROJECT_NETWORK =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/global/networks/{network}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String network;
-
-  @Deprecated
-  protected NetworkName() {
-    project = null;
-    network = null;
-  }
-
-  private NetworkName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    network = Preconditions.checkNotNull(builder.getNetwork());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getNetwork() {
-    return network;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static NetworkName of(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build();
-  }
-
-  public static String format(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build().toString();
-  }
-
-  public static NetworkName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_NETWORK.validatedMatch(
-            formattedString, "NetworkName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("network"));
-  }
-
-  public static List<NetworkName> parseList(List<String> formattedStrings) {
-    List<NetworkName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<NetworkName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (NetworkName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_NETWORK.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 (network != null) {
-            fieldMapBuilder.put("network", network);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_NETWORK.instantiate("project", project, "network", network);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      NetworkName that = ((NetworkName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.network, that.network);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(network);
-    return h;
-  }
-
-  /** Builder for projects/{project}/global/networks/{network}. */
-  public static class Builder {
-    private String project;
-    private String network;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getNetwork() {
-      return network;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setNetwork(String network) {
-      this.network = network;
-      return this;
-    }
-
-    private Builder(NetworkName networkName) {
-      this.project = networkName.project;
-      this.network = networkName.network;
-    }
-
-    public NetworkName build() {
-      return new NetworkName(this);
-    }
-  }
-}
diff --git a/proto-google-cloud-dataproc-metastore-v1beta/clirr-ignored-differences.xml b/proto-google-cloud-dataproc-metastore-v1beta/clirr-ignored-differences.xml
index d3429280..69b4e2f0 100644
--- a/proto-google-cloud-dataproc-metastore-v1beta/clirr-ignored-differences.xml
+++ b/proto-google-cloud-dataproc-metastore-v1beta/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/metastore/v1beta/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/metastore/v1beta/Network*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-dataproc-metastore-v1beta/src/main/java/com/google/cloud/metastore/v1beta/NetworkName.java b/proto-google-cloud-dataproc-metastore-v1beta/src/main/java/com/google/cloud/metastore/v1beta/NetworkName.java
deleted file mode 100644
index 3ffd1313..00000000
--- a/proto-google-cloud-dataproc-metastore-v1beta/src/main/java/com/google/cloud/metastore/v1beta/NetworkName.java
+++ /dev/null
@@ -1,192 +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.metastore.v1beta;
-
-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 NetworkName implements ResourceName {
-  private static final PathTemplate PROJECT_NETWORK =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/global/networks/{network}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String network;
-
-  @Deprecated
-  protected NetworkName() {
-    project = null;
-    network = null;
-  }
-
-  private NetworkName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    network = Preconditions.checkNotNull(builder.getNetwork());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getNetwork() {
-    return network;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static NetworkName of(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build();
-  }
-
-  public static String format(String project, String network) {
-    return newBuilder().setProject(project).setNetwork(network).build().toString();
-  }
-
-  public static NetworkName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_NETWORK.validatedMatch(
-            formattedString, "NetworkName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("network"));
-  }
-
-  public static List<NetworkName> parseList(List<String> formattedStrings) {
-    List<NetworkName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<NetworkName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (NetworkName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_NETWORK.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 (network != null) {
-            fieldMapBuilder.put("network", network);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_NETWORK.instantiate("project", project, "network", network);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      NetworkName that = ((NetworkName) o);
-      return Objects.equals(this.project, that.project)
-          && Objects.equals(this.network, that.network);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(network);
-    return h;
-  }
-
-  /** Builder for projects/{project}/global/networks/{network}. */
-  public static class Builder {
-    private String project;
-    private String network;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getNetwork() {
-      return network;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setNetwork(String network) {
-      this.network = network;
-      return this;
-    }
-
-    private Builder(NetworkName networkName) {
-      this.project = networkName.project;
-      this.network = networkName.network;
-    }
-
-    public NetworkName build() {
-      return new NetworkName(this);
-    }
-  }
-}