Skip to content
This repository was archived by the owner on Dec 15, 2023. It is now read-only.

Commit 445f9df

Browse files
yoshi-automationyoshi-automation
authored
chore: Re-generated to pick up changes from googleapis (#615)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/65fbd59d-5c6b-402d-aaaf-fdf6962fdbbc/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) PiperOrigin-RevId: 389755489 Source-Link: googleapis/googleapis@10185d0 PiperOrigin-RevId: 388535346 Source-Link: googleapis/googleapis@d9eaf41 PiperOrigin-RevId: 388499329 Source-Link: googleapis/googleapis@bb0a090
1 parent 5e665ac commit 445f9df

30 files changed

+1495
-306
lines changed

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,13 @@ public SpeechStubSettings.Builder getStubSettingsBuilder() {
175175
return ((SpeechStubSettings.Builder) getStubSettings());
176176
}
177177

178-
// NEXT_MAJOR_VER: remove 'throws Exception'.
179178
/**
180179
* Applies the given settings updater function to all of the unary API methods in this service.
181180
*
182181
* <p>Note: This method does not support applying settings to streaming methods.
183182
*/
184183
public Builder applyToAllUnaryMethods(
185-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
184+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
186185
super.applyToAllUnaryMethods(
187186
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
188187
return this;

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,13 @@ public UnaryCallable<LongRunningRecognizeRequest, Operation> longRunningRecogniz
191191

192192
@Override
193193
public final void close() {
194-
shutdown();
194+
try {
195+
backgroundResources.close();
196+
} catch (RuntimeException e) {
197+
throw e;
198+
} catch (Exception e) {
199+
throw new IllegalStateException("Failed to close resource", e);
200+
}
195201
}
196202

197203
@Override

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,13 @@ private static Builder initDefaults(Builder builder) {
342342
return builder;
343343
}
344344

345-
// NEXT_MAJOR_VER: remove 'throws Exception'.
346345
/**
347346
* Applies the given settings updater function to all of the unary API methods in this service.
348347
*
349348
* <p>Note: This method does not support applying settings to streaming methods.
350349
*/
351350
public Builder applyToAllUnaryMethods(
352-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
351+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
353352
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
354353
return this;
355354
}

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/AdaptationClient.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.speech.v1p1beta1;
1818

19-
import com.google.api.core.ApiFunction;
2019
import com.google.api.core.ApiFuture;
2120
import com.google.api.core.ApiFutures;
2221
import com.google.api.core.BetaApi;
@@ -1233,12 +1232,7 @@ public static ApiFuture<ListPhraseSetPagedResponse> createAsync(
12331232
ListPhraseSetPage.createEmptyPage().createPageAsync(context, futureResponse);
12341233
return ApiFutures.transform(
12351234
futurePage,
1236-
new ApiFunction<ListPhraseSetPage, ListPhraseSetPagedResponse>() {
1237-
@Override
1238-
public ListPhraseSetPagedResponse apply(ListPhraseSetPage input) {
1239-
return new ListPhraseSetPagedResponse(input);
1240-
}
1241-
},
1235+
input -> new ListPhraseSetPagedResponse(input),
12421236
MoreExecutors.directExecutor());
12431237
}
12441238

@@ -1314,12 +1308,7 @@ public static ApiFuture<ListCustomClassesPagedResponse> createAsync(
13141308
ListCustomClassesPage.createEmptyPage().createPageAsync(context, futureResponse);
13151309
return ApiFutures.transform(
13161310
futurePage,
1317-
new ApiFunction<ListCustomClassesPage, ListCustomClassesPagedResponse>() {
1318-
@Override
1319-
public ListCustomClassesPagedResponse apply(ListCustomClassesPage input) {
1320-
return new ListCustomClassesPagedResponse(input);
1321-
}
1322-
},
1311+
input -> new ListCustomClassesPagedResponse(input),
13231312
MoreExecutors.directExecutor());
13241313
}
13251314

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/AdaptationSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,13 @@ public AdaptationStubSettings.Builder getStubSettingsBuilder() {
208208
return ((AdaptationStubSettings.Builder) getStubSettings());
209209
}
210210

211-
// NEXT_MAJOR_VER: remove 'throws Exception'.
212211
/**
213212
* Applies the given settings updater function to all of the unary API methods in this service.
214213
*
215214
* <p>Note: This method does not support applying settings to streaming methods.
216215
*/
217216
public Builder applyToAllUnaryMethods(
218-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
217+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
219218
super.applyToAllUnaryMethods(
220219
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
221220
return this;

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,13 @@ public SpeechStubSettings.Builder getStubSettingsBuilder() {
176176
return ((SpeechStubSettings.Builder) getStubSettings());
177177
}
178178

179-
// NEXT_MAJOR_VER: remove 'throws Exception'.
180179
/**
181180
* Applies the given settings updater function to all of the unary API methods in this service.
182181
*
183182
* <p>Note: This method does not support applying settings to streaming methods.
184183
*/
185184
public Builder applyToAllUnaryMethods(
186-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
185+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
187186
super.applyToAllUnaryMethods(
188187
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
189188
return this;

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/AdaptationStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,14 +541,13 @@ private static Builder initDefaults(Builder builder) {
541541
return builder;
542542
}
543543

544-
// NEXT_MAJOR_VER: remove 'throws Exception'.
545544
/**
546545
* Applies the given settings updater function to all of the unary API methods in this service.
547546
*
548547
* <p>Note: This method does not support applying settings to streaming methods.
549548
*/
550549
public Builder applyToAllUnaryMethods(
551-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
550+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
552551
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
553552
return this;
554553
}

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcAdaptationStub.java‎

Lines changed: 48 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.api.gax.grpc.GrpcCallSettings;
2626
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2727
import com.google.api.gax.rpc.ClientContext;
28-
import com.google.api.gax.rpc.RequestParamsExtractor;
2928
import com.google.api.gax.rpc.UnaryCallable;
3029
import com.google.cloud.speech.v1p1beta1.CreateCustomClassRequest;
3130
import com.google.cloud.speech.v1p1beta1.CreatePhraseSetRequest;
@@ -47,7 +46,6 @@
4746
import io.grpc.MethodDescriptor;
4847
import io.grpc.protobuf.ProtoUtils;
4948
import java.io.IOException;
50-
import java.util.Map;
5149
import java.util.concurrent.TimeUnit;
5250
import javax.annotation.Generated;
5351

@@ -223,132 +221,102 @@ protected GrpcAdaptationStub(
223221
GrpcCallSettings.<CreatePhraseSetRequest, PhraseSet>newBuilder()
224222
.setMethodDescriptor(createPhraseSetMethodDescriptor)
225223
.setParamsExtractor(
226-
new RequestParamsExtractor<CreatePhraseSetRequest>() {
227-
@Override
228-
public Map<String, String> extract(CreatePhraseSetRequest request) {
229-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
230-
params.put("parent", String.valueOf(request.getParent()));
231-
return params.build();
232-
}
224+
request -> {
225+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
226+
params.put("parent", String.valueOf(request.getParent()));
227+
return params.build();
233228
})
234229
.build();
235230
GrpcCallSettings<GetPhraseSetRequest, PhraseSet> getPhraseSetTransportSettings =
236231
GrpcCallSettings.<GetPhraseSetRequest, PhraseSet>newBuilder()
237232
.setMethodDescriptor(getPhraseSetMethodDescriptor)
238233
.setParamsExtractor(
239-
new RequestParamsExtractor<GetPhraseSetRequest>() {
240-
@Override
241-
public Map<String, String> extract(GetPhraseSetRequest request) {
242-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
243-
params.put("name", String.valueOf(request.getName()));
244-
return params.build();
245-
}
234+
request -> {
235+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
236+
params.put("name", String.valueOf(request.getName()));
237+
return params.build();
246238
})
247239
.build();
248240
GrpcCallSettings<ListPhraseSetRequest, ListPhraseSetResponse> listPhraseSetTransportSettings =
249241
GrpcCallSettings.<ListPhraseSetRequest, ListPhraseSetResponse>newBuilder()
250242
.setMethodDescriptor(listPhraseSetMethodDescriptor)
251243
.setParamsExtractor(
252-
new RequestParamsExtractor<ListPhraseSetRequest>() {
253-
@Override
254-
public Map<String, String> extract(ListPhraseSetRequest request) {
255-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
256-
params.put("parent", String.valueOf(request.getParent()));
257-
return params.build();
258-
}
244+
request -> {
245+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
246+
params.put("parent", String.valueOf(request.getParent()));
247+
return params.build();
259248
})
260249
.build();
261250
GrpcCallSettings<UpdatePhraseSetRequest, PhraseSet> updatePhraseSetTransportSettings =
262251
GrpcCallSettings.<UpdatePhraseSetRequest, PhraseSet>newBuilder()
263252
.setMethodDescriptor(updatePhraseSetMethodDescriptor)
264253
.setParamsExtractor(
265-
new RequestParamsExtractor<UpdatePhraseSetRequest>() {
266-
@Override
267-
public Map<String, String> extract(UpdatePhraseSetRequest request) {
268-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
269-
params.put("phrase_set.name", String.valueOf(request.getPhraseSet().getName()));
270-
return params.build();
271-
}
254+
request -> {
255+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
256+
params.put("phrase_set.name", String.valueOf(request.getPhraseSet().getName()));
257+
return params.build();
272258
})
273259
.build();
274260
GrpcCallSettings<DeletePhraseSetRequest, Empty> deletePhraseSetTransportSettings =
275261
GrpcCallSettings.<DeletePhraseSetRequest, Empty>newBuilder()
276262
.setMethodDescriptor(deletePhraseSetMethodDescriptor)
277263
.setParamsExtractor(
278-
new RequestParamsExtractor<DeletePhraseSetRequest>() {
279-
@Override
280-
public Map<String, String> extract(DeletePhraseSetRequest request) {
281-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
282-
params.put("name", String.valueOf(request.getName()));
283-
return params.build();
284-
}
264+
request -> {
265+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
266+
params.put("name", String.valueOf(request.getName()));
267+
return params.build();
285268
})
286269
.build();
287270
GrpcCallSettings<CreateCustomClassRequest, CustomClass> createCustomClassTransportSettings =
288271
GrpcCallSettings.<CreateCustomClassRequest, CustomClass>newBuilder()
289272
.setMethodDescriptor(createCustomClassMethodDescriptor)
290273
.setParamsExtractor(
291-
new RequestParamsExtractor<CreateCustomClassRequest>() {
292-
@Override
293-
public Map<String, String> extract(CreateCustomClassRequest request) {
294-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
295-
params.put("parent", String.valueOf(request.getParent()));
296-
return params.build();
297-
}
274+
request -> {
275+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
276+
params.put("parent", String.valueOf(request.getParent()));
277+
return params.build();
298278
})
299279
.build();
300280
GrpcCallSettings<GetCustomClassRequest, CustomClass> getCustomClassTransportSettings =
301281
GrpcCallSettings.<GetCustomClassRequest, CustomClass>newBuilder()
302282
.setMethodDescriptor(getCustomClassMethodDescriptor)
303283
.setParamsExtractor(
304-
new RequestParamsExtractor<GetCustomClassRequest>() {
305-
@Override
306-
public Map<String, String> extract(GetCustomClassRequest request) {
307-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
308-
params.put("name", String.valueOf(request.getName()));
309-
return params.build();
310-
}
284+
request -> {
285+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
286+
params.put("name", String.valueOf(request.getName()));
287+
return params.build();
311288
})
312289
.build();
313290
GrpcCallSettings<ListCustomClassesRequest, ListCustomClassesResponse>
314291
listCustomClassesTransportSettings =
315292
GrpcCallSettings.<ListCustomClassesRequest, ListCustomClassesResponse>newBuilder()
316293
.setMethodDescriptor(listCustomClassesMethodDescriptor)
317294
.setParamsExtractor(
318-
new RequestParamsExtractor<ListCustomClassesRequest>() {
319-
@Override
320-
public Map<String, String> extract(ListCustomClassesRequest request) {
321-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
322-
params.put("parent", String.valueOf(request.getParent()));
323-
return params.build();
324-
}
295+
request -> {
296+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
297+
params.put("parent", String.valueOf(request.getParent()));
298+
return params.build();
325299
})
326300
.build();
327301
GrpcCallSettings<UpdateCustomClassRequest, CustomClass> updateCustomClassTransportSettings =
328302
GrpcCallSettings.<UpdateCustomClassRequest, CustomClass>newBuilder()
329303
.setMethodDescriptor(updateCustomClassMethodDescriptor)
330304
.setParamsExtractor(
331-
new RequestParamsExtractor<UpdateCustomClassRequest>() {
332-
@Override
333-
public Map<String, String> extract(UpdateCustomClassRequest request) {
334-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
335-
params.put(
336-
"custom_class.name", String.valueOf(request.getCustomClass().getName()));
337-
return params.build();
338-
}
305+
request -> {
306+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
307+
params.put(
308+
"custom_class.name", String.valueOf(request.getCustomClass().getName()));
309+
return params.build();
339310
})
340311
.build();
341312
GrpcCallSettings<DeleteCustomClassRequest, Empty> deleteCustomClassTransportSettings =
342313
GrpcCallSettings.<DeleteCustomClassRequest, Empty>newBuilder()
343314
.setMethodDescriptor(deleteCustomClassMethodDescriptor)
344315
.setParamsExtractor(
345-
new RequestParamsExtractor<DeleteCustomClassRequest>() {
346-
@Override
347-
public Map<String, String> extract(DeleteCustomClassRequest request) {
348-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
349-
params.put("name", String.valueOf(request.getName()));
350-
return params.build();
351-
}
316+
request -> {
317+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
318+
params.put("name", String.valueOf(request.getName()));
319+
return params.build();
352320
})
353321
.build();
354322

@@ -472,7 +440,13 @@ public UnaryCallable<DeleteCustomClassRequest, Empty> deleteCustomClassCallable(
472440

473441
@Override
474442
public final void close() {
475-
shutdown();
443+
try {
444+
backgroundResources.close();
445+
} catch (RuntimeException e) {
446+
throw e;
447+
} catch (Exception e) {
448+
throw new IllegalStateException("Failed to close resource", e);
449+
}
476450
}
477451

478452
@Override

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,13 @@ public UnaryCallable<LongRunningRecognizeRequest, Operation> longRunningRecogniz
193193

194194
@Override
195195
public final void close() {
196-
shutdown();
196+
try {
197+
backgroundResources.close();
198+
} catch (RuntimeException e) {
199+
throw e;
200+
} catch (Exception e) {
201+
throw new IllegalStateException("Failed to close resource", e);
202+
}
197203
}
198204

199205
@Override

‎google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,13 @@ private static Builder initDefaults(Builder builder) {
343343
return builder;
344344
}
345345

346-
// NEXT_MAJOR_VER: remove 'throws Exception'.
347346
/**
348347
* Applies the given settings updater function to all of the unary API methods in this service.
349348
*
350349
* <p>Note: This method does not support applying settings to streaming methods.
351350
*/
352351
public Builder applyToAllUnaryMethods(
353-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
352+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
354353
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
355354
return this;
356355
}

0 commit comments

Comments
 (0)