From 76594028500490a7c7bf538cdbd41f0a2fe6c2c0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 23:12:42 +0000 Subject: [PATCH] feat!: release gapic-generator-java v2.0.0 (#236) Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../v1/CertificateAuthorityServiceClient.java | 42 +-- .../CertificateAuthorityServiceSettings.java | 3 +- ...rtificateAuthorityServiceStubSettings.java | 3 +- .../GrpcCertificateAuthorityServiceStub.java | 347 +++++++----------- .../CertificateAuthorityServiceClient.java | 33 +- .../CertificateAuthorityServiceSettings.java | 3 +- ...rtificateAuthorityServiceStubSettings.java | 3 +- .../GrpcCertificateAuthorityServiceStub.java | 244 +++++------- 8 files changed, 221 insertions(+), 457 deletions(-) diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java index ff5f8eaf..7e32f6b1 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.security.privateca.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; @@ -4301,12 +4300,7 @@ public static ApiFuture createAsync( ListCertificatesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCertificatesPagedResponse apply(ListCertificatesPage input) { - return new ListCertificatesPagedResponse(input); - } - }, + input -> new ListCertificatesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -4387,14 +4381,7 @@ public static ApiFuture createAsync( ListCertificateAuthoritiesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListCertificateAuthoritiesPage, ListCertificateAuthoritiesPagedResponse>() { - @Override - public ListCertificateAuthoritiesPagedResponse apply( - ListCertificateAuthoritiesPage input) { - return new ListCertificateAuthoritiesPagedResponse(input); - } - }, + input -> new ListCertificateAuthoritiesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -4485,14 +4472,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListCaPoolsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListCaPoolsPagedResponse apply(ListCaPoolsPage input) { - return new ListCaPoolsPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListCaPoolsPagedResponse(input), MoreExecutors.directExecutor()); } private ListCaPoolsPagedResponse(ListCaPoolsPage page) { @@ -4571,14 +4551,7 @@ public static ApiFuture createAsync .createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListCertificateRevocationListsPage, ListCertificateRevocationListsPagedResponse>() { - @Override - public ListCertificateRevocationListsPagedResponse apply( - ListCertificateRevocationListsPage input) { - return new ListCertificateRevocationListsPagedResponse(input); - } - }, + input -> new ListCertificateRevocationListsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -4674,12 +4647,7 @@ public static ApiFuture createAsync( ListCertificateTemplatesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCertificateTemplatesPagedResponse apply(ListCertificateTemplatesPage input) { - return new ListCertificateTemplatesPagedResponse(input); - } - }, + input -> new ListCertificateTemplatesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceSettings.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceSettings.java index 83e75f55..1aa22061 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceSettings.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceSettings.java @@ -469,14 +469,13 @@ public CertificateAuthorityServiceStubSettings.Builder getStubSettingsBuilder() return ((CertificateAuthorityServiceStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStubSettings.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStubSettings.java index d94cc8b7..fcee9483 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStubSettings.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/CertificateAuthorityServiceStubSettings.java @@ -1838,14 +1838,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. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/GrpcCertificateAuthorityServiceStub.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/GrpcCertificateAuthorityServiceStub.java index 09f29a7d..1f29ed1c 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/GrpcCertificateAuthorityServiceStub.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/stub/GrpcCertificateAuthorityServiceStub.java @@ -28,7 +28,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.security.privateca.v1.ActivateCertificateAuthorityRequest; import com.google.cloud.security.privateca.v1.CaPool; @@ -79,7 +78,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; @@ -580,26 +578,20 @@ protected GrpcCertificateAuthorityServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -607,40 +599,31 @@ public Map extract(GetCertificateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCertificatesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCertificatesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings revokeCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(revokeCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(RevokeCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate.name", String.valueOf(request.getCertificate().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate.name", String.valueOf(request.getCertificate().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -648,14 +631,10 @@ public Map extract(UpdateCertificateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(activateCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ActivateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -663,14 +642,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(createCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - CreateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -678,14 +653,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(disableCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DisableCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -693,14 +664,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(enableCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - EnableCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -710,14 +677,10 @@ public Map extract( newBuilder() .setMethodDescriptor(fetchCertificateAuthorityCsrMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - FetchCertificateAuthorityCsrRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -725,13 +688,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(getCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -740,14 +700,10 @@ public Map extract(GetCertificateAuthorityRequest request) { .newBuilder() .setMethodDescriptor(listCertificateAuthoritiesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListCertificateAuthoritiesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -755,14 +711,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(undeleteCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UndeleteCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -770,14 +722,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DeleteCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -785,94 +733,72 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate_authority.name", - String.valueOf(request.getCertificateAuthority().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate_authority.name", + String.valueOf(request.getCertificateAuthority().getName())); + return params.build(); }) .build(); GrpcCallSettings createCaPoolTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createCaPoolMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCaPoolRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateCaPoolTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCaPoolMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCaPoolRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("ca_pool.name", String.valueOf(request.getCaPool().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("ca_pool.name", String.valueOf(request.getCaPool().getName())); + return params.build(); }) .build(); GrpcCallSettings getCaPoolTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getCaPoolMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCaPoolRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listCaPoolsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listCaPoolsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCaPoolsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteCaPoolTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteCaPoolMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteCaPoolRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings fetchCaCertsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(fetchCaCertsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(FetchCaCertsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("ca_pool", String.valueOf(request.getCaPool())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("ca_pool", String.valueOf(request.getCaPool())); + return params.build(); }) .build(); GrpcCallSettings @@ -881,14 +807,10 @@ public Map extract(FetchCaCertsRequest request) { .newBuilder() .setMethodDescriptor(getCertificateRevocationListMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - GetCertificateRevocationListRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -898,14 +820,10 @@ public Map extract( newBuilder() .setMethodDescriptor(listCertificateRevocationListsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListCertificateRevocationListsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -913,16 +831,12 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateRevocationListMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateCertificateRevocationListRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate_revocation_list.name", - String.valueOf(request.getCertificateRevocationList().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate_revocation_list.name", + String.valueOf(request.getCertificateRevocationList().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -930,13 +844,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(createCertificateTemplateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCertificateTemplateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -944,13 +855,10 @@ public Map extract(CreateCertificateTemplateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteCertificateTemplateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteCertificateTemplateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -958,13 +866,10 @@ public Map extract(DeleteCertificateTemplateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getCertificateTemplateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCertificateTemplateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -973,13 +878,10 @@ public Map extract(GetCertificateTemplateRequest request) { .newBuilder() .setMethodDescriptor(listCertificateTemplatesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCertificateTemplatesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -987,15 +889,12 @@ public Map extract(ListCertificateTemplatesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateTemplateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCertificateTemplateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate_template.name", - String.valueOf(request.getCertificateTemplate().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate_template.name", + String.valueOf(request.getCertificateTemplate().getName())); + return params.build(); }) .build(); diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceClient.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceClient.java index 90170001..42211522 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceClient.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.security.privateca.v1beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -3082,12 +3081,7 @@ public static ApiFuture createAsync( ListCertificatesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCertificatesPagedResponse apply(ListCertificatesPage input) { - return new ListCertificatesPagedResponse(input); - } - }, + input -> new ListCertificatesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3168,14 +3162,7 @@ public static ApiFuture createAsync( ListCertificateAuthoritiesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListCertificateAuthoritiesPage, ListCertificateAuthoritiesPagedResponse>() { - @Override - public ListCertificateAuthoritiesPagedResponse apply( - ListCertificateAuthoritiesPage input) { - return new ListCertificateAuthoritiesPagedResponse(input); - } - }, + input -> new ListCertificateAuthoritiesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3272,14 +3259,7 @@ public static ApiFuture createAsync .createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListCertificateRevocationListsPage, ListCertificateRevocationListsPagedResponse>() { - @Override - public ListCertificateRevocationListsPagedResponse apply( - ListCertificateRevocationListsPage input) { - return new ListCertificateRevocationListsPagedResponse(input); - } - }, + input -> new ListCertificateRevocationListsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3372,12 +3352,7 @@ public static ApiFuture createAsync( ListReusableConfigsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListReusableConfigsPagedResponse apply(ListReusableConfigsPage input) { - return new ListReusableConfigsPagedResponse(input); - } - }, + input -> new ListReusableConfigsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceSettings.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceSettings.java index 150ba6e6..9460b95b 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceSettings.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceSettings.java @@ -369,14 +369,13 @@ public CertificateAuthorityServiceStubSettings.Builder getStubSettingsBuilder() return ((CertificateAuthorityServiceStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/CertificateAuthorityServiceStubSettings.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/CertificateAuthorityServiceStubSettings.java index b8fc89d6..2a7291e8 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/CertificateAuthorityServiceStubSettings.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/CertificateAuthorityServiceStubSettings.java @@ -1350,14 +1350,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. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/GrpcCertificateAuthorityServiceStub.java b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/GrpcCertificateAuthorityServiceStub.java index 52f681ad..3ad9c86f 100644 --- a/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/GrpcCertificateAuthorityServiceStub.java +++ b/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/stub/GrpcCertificateAuthorityServiceStub.java @@ -28,7 +28,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.security.privateca.v1beta1.ActivateCertificateAuthorityRequest; import com.google.cloud.security.privateca.v1beta1.Certificate; @@ -66,7 +65,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; @@ -442,26 +440,20 @@ protected GrpcCertificateAuthorityServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -469,40 +461,31 @@ public Map extract(GetCertificateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCertificatesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCertificatesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings revokeCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(revokeCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(RevokeCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateCertificateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCertificateRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate.name", String.valueOf(request.getCertificate().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate.name", String.valueOf(request.getCertificate().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -510,14 +493,10 @@ public Map extract(UpdateCertificateRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(activateCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ActivateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -525,14 +504,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(createCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - CreateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -540,14 +515,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(disableCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DisableCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -555,14 +526,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(enableCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - EnableCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -572,14 +539,10 @@ public Map extract( newBuilder() .setMethodDescriptor(fetchCertificateAuthorityCsrMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - FetchCertificateAuthorityCsrRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -587,13 +550,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(getCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -602,14 +562,10 @@ public Map extract(GetCertificateAuthorityRequest request) { .newBuilder() .setMethodDescriptor(listCertificateAuthoritiesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListCertificateAuthoritiesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -617,14 +573,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(restoreCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - RestoreCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -632,14 +584,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(scheduleDeleteCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ScheduleDeleteCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -647,16 +595,12 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateAuthorityMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateCertificateAuthorityRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate_authority.name", - String.valueOf(request.getCertificateAuthority().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate_authority.name", + String.valueOf(request.getCertificateAuthority().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -665,14 +609,10 @@ public Map extract( .newBuilder() .setMethodDescriptor(getCertificateRevocationListMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - GetCertificateRevocationListRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -682,14 +622,10 @@ public Map extract( newBuilder() .setMethodDescriptor(listCertificateRevocationListsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListCertificateRevocationListsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -697,29 +633,22 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCertificateRevocationListMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateCertificateRevocationListRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "certificate_revocation_list.name", - String.valueOf(request.getCertificateRevocationList().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "certificate_revocation_list.name", + String.valueOf(request.getCertificateRevocationList().getName())); + return params.build(); }) .build(); GrpcCallSettings getReusableConfigTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getReusableConfigMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetReusableConfigRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -727,13 +656,10 @@ public Map extract(GetReusableConfigRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listReusableConfigsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListReusableConfigsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build();