From abe0325237930fed2d53f6b065fba965f13d5be7 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 4 Aug 2021 15:22:33 -0700 Subject: [PATCH] feat!: Java 8 breaking generator changes (#453) * chore: release gapic-generator-java v1.0.17 Committer: @miraleung PiperOrigin-RevId: 388499329 Source-Author: Google APIs Source-Date: Tue Aug 3 11:12:29 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: bb0a090d9204110042ab5dee2ce9e06e8071ce54 Source-Link: https://github.com/googleapis/googleapis/commit/bb0a090d9204110042ab5dee2ce9e06e8071ce54 * feat!: release gapic-generator-java v2.0.0 Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Author: Google APIs Source-Date: Tue Aug 3 13:48:38 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 --- .../v1/ReservationServiceClient.java | 29 +-- .../v1/ReservationServiceSettings.java | 3 +- .../v1/stub/GrpcReservationServiceStub.java | 229 +++++++----------- .../stub/ReservationServiceStubSettings.java | 3 +- synth.metadata | 6 +- 5 files changed, 97 insertions(+), 173 deletions(-) diff --git a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClient.java b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClient.java index c3a16c0a..28177c3a 100644 --- a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClient.java +++ b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClient.java @@ -16,7 +16,6 @@ package com.google.cloud.bigquery.reservation.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; @@ -2838,12 +2837,7 @@ public static ApiFuture createAsync( ListReservationsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListReservationsPagedResponse apply(ListReservationsPage input) { - return new ListReservationsPagedResponse(input); - } - }, + input -> new ListReservationsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -2922,12 +2916,7 @@ public static ApiFuture createAsync( ListCapacityCommitmentsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCapacityCommitmentsPagedResponse apply(ListCapacityCommitmentsPage input) { - return new ListCapacityCommitmentsPagedResponse(input); - } - }, + input -> new ListCapacityCommitmentsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3013,12 +3002,7 @@ public static ApiFuture createAsync( ListAssignmentsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAssignmentsPagedResponse apply(ListAssignmentsPage input) { - return new ListAssignmentsPagedResponse(input); - } - }, + input -> new ListAssignmentsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3095,12 +3079,7 @@ public static ApiFuture createAsync( SearchAssignmentsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public SearchAssignmentsPagedResponse apply(SearchAssignmentsPage input) { - return new SearchAssignmentsPagedResponse(input); - } - }, + input -> new SearchAssignmentsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceSettings.java b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceSettings.java index 407064fa..9b7dd396 100644 --- a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceSettings.java +++ b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceSettings.java @@ -272,14 +272,13 @@ public ReservationServiceStubSettings.Builder getStubSettingsBuilder() { return ((ReservationServiceStubSettings.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-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/GrpcReservationServiceStub.java b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/GrpcReservationServiceStub.java index eda63524..14ff223f 100644 --- a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/GrpcReservationServiceStub.java +++ b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/GrpcReservationServiceStub.java @@ -26,7 +26,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.bigquery.reservation.v1.Assignment; import com.google.cloud.bigquery.reservation.v1.BiReservation; @@ -62,7 +61,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; @@ -379,13 +377,10 @@ protected GrpcReservationServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateReservationRequest 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 @@ -393,53 +388,41 @@ public Map extract(CreateReservationRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listReservationsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListReservationsRequest 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 getReservationTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetReservationRequest 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 deleteReservationTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteReservationRequest 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 updateReservationTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateReservationRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "reservation.name", String.valueOf(request.getReservation().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "reservation.name", String.valueOf(request.getReservation().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -447,13 +430,10 @@ public Map extract(UpdateReservationRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createCapacityCommitmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCapacityCommitmentRequest 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 @@ -462,13 +442,10 @@ public Map extract(CreateCapacityCommitmentRequest request) { .newBuilder() .setMethodDescriptor(listCapacityCommitmentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCapacityCommitmentsRequest 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 @@ -476,13 +453,10 @@ public Map extract(ListCapacityCommitmentsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getCapacityCommitmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCapacityCommitmentRequest 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 @@ -490,13 +464,10 @@ public Map extract(GetCapacityCommitmentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteCapacityCommitmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteCapacityCommitmentRequest 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 @@ -504,15 +475,12 @@ public Map extract(DeleteCapacityCommitmentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCapacityCommitmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCapacityCommitmentRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "capacity_commitment.name", - String.valueOf(request.getCapacityCommitment().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "capacity_commitment.name", + String.valueOf(request.getCapacityCommitment().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -521,13 +489,10 @@ public Map extract(UpdateCapacityCommitmentRequest request) { .newBuilder() .setMethodDescriptor(splitCapacityCommitmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SplitCapacityCommitmentRequest 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 @@ -535,26 +500,20 @@ public Map extract(SplitCapacityCommitmentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(mergeCapacityCommitmentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(MergeCapacityCommitmentsRequest 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 createAssignmentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createAssignmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateAssignmentRequest 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 @@ -562,26 +521,20 @@ public Map extract(CreateAssignmentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listAssignmentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListAssignmentsRequest 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 deleteAssignmentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAssignmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteAssignmentRequest 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 @@ -589,39 +542,30 @@ public Map extract(DeleteAssignmentRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(searchAssignmentsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SearchAssignmentsRequest 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 moveAssignmentTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(moveAssignmentMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(MoveAssignmentRequest 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 getBiReservationTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getBiReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetBiReservationRequest 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 @@ -629,15 +573,12 @@ public Map extract(GetBiReservationRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateBiReservationMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateBiReservationRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "bi_reservation.name", - String.valueOf(request.getBiReservation().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "bi_reservation.name", + String.valueOf(request.getBiReservation().getName())); + return params.build(); }) .build(); @@ -876,7 +817,13 @@ public UnaryCallable updateBiReservat @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java index 262942d7..3daf4ee2 100644 --- a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java +++ b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java @@ -918,14 +918,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/synth.metadata b/synth.metadata index f27183d3..30e24304 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigqueryreservation.git", - "sha": "981a4a64d8ffc500118fd736f2850fd789b7e368" + "sha": "3ab6abca4286a9fc35aeed2e11831288a6696569" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, {