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

Commit d1404b2

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat!: release gapic-generator-java v2.0.0 (#34)
Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: googleapis/googleapis@d9eaf41 Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a
1 parent 865c4a8 commit d1404b2

File tree

7 files changed

+47
-61
lines changed

7 files changed

+47
-61
lines changed

‎.github/.OwlBot.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ docker:
1717

1818
deep-remove-regex:
1919
- "/grpc-google-.*/src"
20-
- "/proto-google-.*/src"
20+
- "/proto-google-cloud.*/src"
2121
- "/google-.*/src"
2222

2323
deep-preserve-regex:
2424
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
25+
- "/proto-google-devtools-source-protos"
2526

2627
deep-copy-regex:
2728
- source: "/google/devtools/clouddebugger/(v.*)/.*-java/proto-google-.*/src"

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,13 @@ public Controller2StubSettings.Builder getStubSettingsBuilder() {
173173
return ((Controller2StubSettings.Builder) getStubSettings());
174174
}
175175

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

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,13 @@ public Debugger2StubSettings.Builder getStubSettingsBuilder() {
185185
return ((Debugger2StubSettings.Builder) getStubSettings());
186186
}
187187

188-
// NEXT_MAJOR_VER: remove 'throws Exception'.
189188
/**
190189
* Applies the given settings updater function to all of the unary API methods in this service.
191190
*
192191
* <p>Note: This method does not support applying settings to streaming methods.
193192
*/
194193
public Builder applyToAllUnaryMethods(
195-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
194+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
196195
super.applyToAllUnaryMethods(
197196
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
198197
return this;

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,13 @@ private static Builder initDefaults(Builder builder) {
310310
return builder;
311311
}
312312

313-
// NEXT_MAJOR_VER: remove 'throws Exception'.
314313
/**
315314
* Applies the given settings updater function to all of the unary API methods in this service.
316315
*
317316
* <p>Note: This method does not support applying settings to streaming methods.
318317
*/
319318
public Builder applyToAllUnaryMethods(
320-
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
319+
ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
321320
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
322321
return this;
323322
}

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java‎

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

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

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcController2Stub.java‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.api.gax.grpc.GrpcCallSettings;
2222
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2323
import com.google.api.gax.rpc.ClientContext;
24-
import com.google.api.gax.rpc.RequestParamsExtractor;
2524
import com.google.api.gax.rpc.UnaryCallable;
2625
import com.google.common.collect.ImmutableMap;
2726
import com.google.devtools.clouddebugger.v2.ListActiveBreakpointsRequest;
@@ -34,7 +33,6 @@
3433
import io.grpc.MethodDescriptor;
3534
import io.grpc.protobuf.ProtoUtils;
3635
import java.io.IOException;
37-
import java.util.Map;
3836
import java.util.concurrent.TimeUnit;
3937
import javax.annotation.Generated;
4038

@@ -143,13 +141,10 @@ protected GrpcController2Stub(
143141
.<ListActiveBreakpointsRequest, ListActiveBreakpointsResponse>newBuilder()
144142
.setMethodDescriptor(listActiveBreakpointsMethodDescriptor)
145143
.setParamsExtractor(
146-
new RequestParamsExtractor<ListActiveBreakpointsRequest>() {
147-
@Override
148-
public Map<String, String> extract(ListActiveBreakpointsRequest request) {
149-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
150-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
151-
return params.build();
152-
}
144+
request -> {
145+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
146+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
147+
return params.build();
153148
})
154149
.build();
155150
GrpcCallSettings<UpdateActiveBreakpointRequest, UpdateActiveBreakpointResponse>
@@ -158,15 +153,11 @@ public Map<String, String> extract(ListActiveBreakpointsRequest request) {
158153
.<UpdateActiveBreakpointRequest, UpdateActiveBreakpointResponse>newBuilder()
159154
.setMethodDescriptor(updateActiveBreakpointMethodDescriptor)
160155
.setParamsExtractor(
161-
new RequestParamsExtractor<UpdateActiveBreakpointRequest>() {
162-
@Override
163-
public Map<String, String> extract(UpdateActiveBreakpointRequest request) {
164-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
165-
params.put(
166-
"breakpoint.id", String.valueOf(request.getBreakpoint().getId()));
167-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
168-
return params.build();
169-
}
156+
request -> {
157+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
158+
params.put("breakpoint.id", String.valueOf(request.getBreakpoint().getId()));
159+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
160+
return params.build();
170161
})
171162
.build();
172163

@@ -212,7 +203,13 @@ public GrpcOperationsStub getOperationsStub() {
212203

213204
@Override
214205
public final void close() {
215-
shutdown();
206+
try {
207+
backgroundResources.close();
208+
} catch (RuntimeException e) {
209+
throw e;
210+
} catch (Exception e) {
211+
throw new IllegalStateException("Failed to close resource", e);
212+
}
216213
}
217214

218215
@Override

‎google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcDebugger2Stub.java‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.api.gax.grpc.GrpcCallSettings;
2222
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2323
import com.google.api.gax.rpc.ClientContext;
24-
import com.google.api.gax.rpc.RequestParamsExtractor;
2524
import com.google.api.gax.rpc.UnaryCallable;
2625
import com.google.common.collect.ImmutableMap;
2726
import com.google.devtools.clouddebugger.v2.DeleteBreakpointRequest;
@@ -38,7 +37,6 @@
3837
import io.grpc.MethodDescriptor;
3938
import io.grpc.protobuf.ProtoUtils;
4039
import java.io.IOException;
41-
import java.util.Map;
4240
import java.util.concurrent.TimeUnit;
4341
import javax.annotation.Generated;
4442

@@ -156,55 +154,43 @@ protected GrpcDebugger2Stub(
156154
GrpcCallSettings.<SetBreakpointRequest, SetBreakpointResponse>newBuilder()
157155
.setMethodDescriptor(setBreakpointMethodDescriptor)
158156
.setParamsExtractor(
159-
new RequestParamsExtractor<SetBreakpointRequest>() {
160-
@Override
161-
public Map<String, String> extract(SetBreakpointRequest request) {
162-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
163-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
164-
return params.build();
165-
}
157+
request -> {
158+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
159+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
160+
return params.build();
166161
})
167162
.build();
168163
GrpcCallSettings<GetBreakpointRequest, GetBreakpointResponse> getBreakpointTransportSettings =
169164
GrpcCallSettings.<GetBreakpointRequest, GetBreakpointResponse>newBuilder()
170165
.setMethodDescriptor(getBreakpointMethodDescriptor)
171166
.setParamsExtractor(
172-
new RequestParamsExtractor<GetBreakpointRequest>() {
173-
@Override
174-
public Map<String, String> extract(GetBreakpointRequest request) {
175-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
176-
params.put("breakpoint_id", String.valueOf(request.getBreakpointId()));
177-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
178-
return params.build();
179-
}
167+
request -> {
168+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
169+
params.put("breakpoint_id", String.valueOf(request.getBreakpointId()));
170+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
171+
return params.build();
180172
})
181173
.build();
182174
GrpcCallSettings<DeleteBreakpointRequest, Empty> deleteBreakpointTransportSettings =
183175
GrpcCallSettings.<DeleteBreakpointRequest, Empty>newBuilder()
184176
.setMethodDescriptor(deleteBreakpointMethodDescriptor)
185177
.setParamsExtractor(
186-
new RequestParamsExtractor<DeleteBreakpointRequest>() {
187-
@Override
188-
public Map<String, String> extract(DeleteBreakpointRequest request) {
189-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
190-
params.put("breakpoint_id", String.valueOf(request.getBreakpointId()));
191-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
192-
return params.build();
193-
}
178+
request -> {
179+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
180+
params.put("breakpoint_id", String.valueOf(request.getBreakpointId()));
181+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
182+
return params.build();
194183
})
195184
.build();
196185
GrpcCallSettings<ListBreakpointsRequest, ListBreakpointsResponse>
197186
listBreakpointsTransportSettings =
198187
GrpcCallSettings.<ListBreakpointsRequest, ListBreakpointsResponse>newBuilder()
199188
.setMethodDescriptor(listBreakpointsMethodDescriptor)
200189
.setParamsExtractor(
201-
new RequestParamsExtractor<ListBreakpointsRequest>() {
202-
@Override
203-
public Map<String, String> extract(ListBreakpointsRequest request) {
204-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
205-
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
206-
return params.build();
207-
}
190+
request -> {
191+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
192+
params.put("debuggee_id", String.valueOf(request.getDebuggeeId()));
193+
return params.build();
208194
})
209195
.build();
210196
GrpcCallSettings<ListDebuggeesRequest, ListDebuggeesResponse> listDebuggeesTransportSettings =
@@ -263,7 +249,13 @@ public UnaryCallable<ListDebuggeesRequest, ListDebuggeesResponse> listDebuggeesC
263249

264250
@Override
265251
public final void close() {
266-
shutdown();
252+
try {
253+
backgroundResources.close();
254+
} catch (RuntimeException e) {
255+
throw e;
256+
} catch (Exception e) {
257+
throw new IllegalStateException("Failed to close resource", e);
258+
}
267259
}
268260

269261
@Override

0 commit comments

Comments
 (0)