diff --git a/src/main/java/io/grafeas/v1/GrafeasClient.java b/src/main/java/io/grafeas/v1/GrafeasClient.java index a3ae6468..d9024593 100644 --- a/src/main/java/io/grafeas/v1/GrafeasClient.java +++ b/src/main/java/io/grafeas/v1/GrafeasClient.java @@ -16,7 +16,6 @@ package io.grafeas.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; @@ -1750,12 +1749,7 @@ public static ApiFuture createAsync( ListOccurrencesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListOccurrencesPagedResponse apply(ListOccurrencesPage input) { - return new ListOccurrencesPagedResponse(input); - } - }, + input -> new ListOccurrencesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1827,14 +1821,7 @@ public static ApiFuture createAsync( ApiFuture futurePage = ListNotesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public ListNotesPagedResponse apply(ListNotesPage input) { - return new ListNotesPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); + futurePage, input -> new ListNotesPagedResponse(input), MoreExecutors.directExecutor()); } private ListNotesPagedResponse(ListNotesPage page) { @@ -1904,12 +1891,7 @@ public static ApiFuture createAsync( ListNoteOccurrencesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListNoteOccurrencesPagedResponse apply(ListNoteOccurrencesPage input) { - return new ListNoteOccurrencesPagedResponse(input); - } - }, + input -> new ListNoteOccurrencesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/src/main/java/io/grafeas/v1/GrafeasSettings.java b/src/main/java/io/grafeas/v1/GrafeasSettings.java index 4e1e6228..5a5cdba3 100644 --- a/src/main/java/io/grafeas/v1/GrafeasSettings.java +++ b/src/main/java/io/grafeas/v1/GrafeasSettings.java @@ -233,14 +233,13 @@ public GrafeasStubSettings.Builder getStubSettingsBuilder() { return ((GrafeasStubSettings.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/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java b/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java index 397360ac..85b7d2ea 100644 --- a/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java +++ b/src/main/java/io/grafeas/v1/stub/GrafeasStubSettings.java @@ -707,14 +707,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/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java b/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java index 420237c3..f56d1d40 100644 --- a/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java +++ b/src/main/java/io/grafeas/v1/stub/GrpcGrafeasStub.java @@ -25,7 +25,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.common.collect.ImmutableMap; import com.google.longrunning.stub.GrpcOperationsStub; @@ -54,7 +53,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; @@ -270,13 +268,10 @@ protected GrpcGrafeasStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getOccurrenceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetOccurrenceRequest 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 @@ -284,39 +279,30 @@ public Map extract(GetOccurrenceRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listOccurrencesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListOccurrencesRequest 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 deleteOccurrenceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteOccurrenceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteOccurrenceRequest 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 createOccurrenceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createOccurrenceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateOccurrenceRequest 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 @@ -325,91 +311,70 @@ public Map extract(CreateOccurrenceRequest request) { .newBuilder() .setMethodDescriptor(batchCreateOccurrencesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchCreateOccurrencesRequest 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 updateOccurrenceTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateOccurrenceMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateOccurrenceRequest 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 getOccurrenceNoteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getOccurrenceNoteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetOccurrenceNoteRequest 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 getNoteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getNoteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetNoteRequest 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 listNotesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listNotesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListNotesRequest 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 deleteNoteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteNoteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteNoteRequest 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 createNoteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createNoteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateNoteRequest 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 @@ -417,26 +382,20 @@ public Map extract(CreateNoteRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchCreateNotesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchCreateNotesRequest 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 updateNoteTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateNoteMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateNoteRequest 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 @@ -444,13 +403,10 @@ public Map extract(UpdateNoteRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listNoteOccurrencesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListNoteOccurrencesRequest 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(); @@ -614,7 +570,13 @@ public UnaryCallable updateNoteCallable() { @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/synth.metadata b/synth.metadata index fa142b82..fa5279de 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, {