diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 78e0d389..13004fad 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -17,11 +17,12 @@ docker: deep-remove-regex: - "/grpc-google-.*/src" -- "/proto-google-.*/src" +- "/proto-google-cloud.*/src" - "/google-.*/src" deep-preserve-regex: - "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" +- "/proto-google-devtools-source-protos" deep-copy-regex: - source: "/google/devtools/clouddebugger/(v.*)/.*-java/proto-google-.*/src" diff --git a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java index 15d3f66e..be9bd44b 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Controller2Settings.java @@ -173,14 +173,13 @@ public Controller2StubSettings.Builder getStubSettingsBuilder() { return ((Controller2StubSettings.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-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java index c136c6e3..a6fa934e 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/Debugger2Settings.java @@ -185,14 +185,13 @@ public Debugger2StubSettings.Builder getStubSettingsBuilder() { return ((Debugger2StubSettings.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-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java index 8d6ad467..736434e3 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Controller2StubSettings.java @@ -310,14 +310,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-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java index 8d062c17..6c6ab41a 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/Debugger2StubSettings.java @@ -345,14 +345,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-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcController2Stub.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcController2Stub.java index 9354ca3d..7531c941 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcController2Stub.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcController2Stub.java @@ -21,7 +21,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.devtools.clouddebugger.v2.ListActiveBreakpointsRequest; @@ -34,7 +33,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; @@ -143,13 +141,10 @@ protected GrpcController2Stub( .newBuilder() .setMethodDescriptor(listActiveBreakpointsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListActiveBreakpointsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); GrpcCallSettings @@ -158,15 +153,11 @@ public Map extract(ListActiveBreakpointsRequest request) { .newBuilder() .setMethodDescriptor(updateActiveBreakpointMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateActiveBreakpointRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "breakpoint.id", String.valueOf(request.getBreakpoint().getId())); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("breakpoint.id", String.valueOf(request.getBreakpoint().getId())); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); @@ -212,7 +203,13 @@ public GrpcOperationsStub getOperationsStub() { @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-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcDebugger2Stub.java b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcDebugger2Stub.java index 53fc8997..192ac799 100644 --- a/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcDebugger2Stub.java +++ b/google-cloud-debugger-client/src/main/java/com/google/cloud/debugger/v2/stub/GrpcDebugger2Stub.java @@ -21,7 +21,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.devtools.clouddebugger.v2.DeleteBreakpointRequest; @@ -38,7 +37,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; @@ -156,41 +154,32 @@ protected GrpcDebugger2Stub( GrpcCallSettings.newBuilder() .setMethodDescriptor(setBreakpointMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SetBreakpointRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); GrpcCallSettings getBreakpointTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getBreakpointMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetBreakpointRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("breakpoint_id", String.valueOf(request.getBreakpointId())); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("breakpoint_id", String.valueOf(request.getBreakpointId())); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); GrpcCallSettings deleteBreakpointTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteBreakpointMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteBreakpointRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("breakpoint_id", String.valueOf(request.getBreakpointId())); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("breakpoint_id", String.valueOf(request.getBreakpointId())); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); GrpcCallSettings @@ -198,13 +187,10 @@ public Map extract(DeleteBreakpointRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listBreakpointsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListBreakpointsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("debuggee_id", String.valueOf(request.getDebuggeeId())); + return params.build(); }) .build(); GrpcCallSettings listDebuggeesTransportSettings = @@ -263,7 +249,13 @@ public UnaryCallable listDebuggeesC @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