From 6bc201fc52233f819e825cccd16564fe568230db Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Thu, 5 Aug 2021 02:13:48 -0700 Subject: [PATCH 1/2] chore: release gapic-generator-java v1.0.17 Committer: @miraleung PiperOrigin-RevId: 388499329 Source-Link: https://github.com/googleapis/googleapis/commit/bb0a090d9204110042ab5dee2ce9e06e8071ce54 Source-Author: Bazel Bot Source-Date: Tue Aug 3 18:42:39 2021 +0000 Source-Repo: googleapis/googleapis-gen Source-Sha: d196f38277f745f7d99d468c5af0950bc9925b44 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d196f38277f745f7d99d468c5af0950bc9925b44 --- .../google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java | 8 +++++++- synth.metadata | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java index 5a51995..0ad8cba 100644 --- a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java +++ b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java @@ -350,7 +350,13 @@ public UnaryCallable deletePolicyCallable() { @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 5fc8758..6928750 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-orgpolicy.git", - "sha": "2317fde01451dd636b67f6a39ecbe288d55bcd89" + "sha": "9a56ea9c903f6951d4ee0e516765d35571fe8e83" } }, { @@ -19,8 +19,8 @@ "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "478f36572d7bcf1dc66038d0e76b9b3fa2abae63", - "internalRef": "379784268" + "sha": "d196f38277f745f7d99d468c5af0950bc9925b44", + "internalRef": "388499329" } }, { From 432da673e9d737f9160463a56650678390e3450e Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Thu, 5 Aug 2021 02:14:08 -0700 Subject: [PATCH 2/2] feat!: release gapic-generator-java v2.0.0 Committer: @miraleung PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 Source-Author: Bazel Bot Source-Date: Tue Aug 3 21:42:50 2021 +0000 Source-Repo: googleapis/googleapis-gen Source-Sha: 976c5ab6f24b58c91fe04847ead1953f99d19e6a Source-Link: https://github.com/googleapis/googleapis-gen/commit/976c5ab6f24b58c91fe04847ead1953f99d19e6a --- .../cloud/orgpolicy/v2/OrgPolicyClient.java | 15 +--- .../cloud/orgpolicy/v2/OrgPolicySettings.java | 3 +- .../orgpolicy/v2/stub/GrpcOrgPolicyStub.java | 79 +++++++------------ .../v2/stub/OrgPolicyStubSettings.java | 3 +- synth.metadata | 4 +- 5 files changed, 34 insertions(+), 70 deletions(-) diff --git a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyClient.java b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyClient.java index fed772d..98ea78c 100644 --- a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyClient.java +++ b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyClient.java @@ -16,7 +16,6 @@ package com.google.cloud.orgpolicy.v2; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -1244,12 +1243,7 @@ public static ApiFuture createAsync( ListConstraintsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListConstraintsPagedResponse apply(ListConstraintsPage input) { - return new ListConstraintsPagedResponse(input); - } - }, + input -> new ListConstraintsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -1326,12 +1320,7 @@ public static ApiFuture createAsync( ListPoliciesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListPoliciesPagedResponse apply(ListPoliciesPage input) { - return new ListPoliciesPagedResponse(input); - } - }, + input -> new ListPoliciesPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicySettings.java b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicySettings.java index 88c50c0..06adaa2 100644 --- a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicySettings.java +++ b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicySettings.java @@ -192,14 +192,13 @@ public OrgPolicyStubSettings.Builder getStubSettingsBuilder() { return ((OrgPolicyStubSettings.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-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java index 0ad8cba..da85860 100644 --- a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java +++ b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/GrpcOrgPolicyStub.java @@ -24,7 +24,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.orgpolicy.v2.CreatePolicyRequest; import com.google.cloud.orgpolicy.v2.DeletePolicyRequest; @@ -42,7 +41,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; @@ -176,91 +174,70 @@ protected GrpcOrgPolicyStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(listConstraintsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListConstraintsRequest 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 listPoliciesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listPoliciesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListPoliciesRequest 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 getPolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetPolicyRequest 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 getEffectivePolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getEffectivePolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetEffectivePolicyRequest 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 createPolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreatePolicyRequest 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 updatePolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updatePolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdatePolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("policy.name", String.valueOf(request.getPolicy().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("policy.name", String.valueOf(request.getPolicy().getName())); + return params.build(); }) .build(); GrpcCallSettings deletePolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deletePolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeletePolicyRequest 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(); diff --git a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/OrgPolicyStubSettings.java b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/OrgPolicyStubSettings.java index 2b6d242..969d832 100644 --- a/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/OrgPolicyStubSettings.java +++ b/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/OrgPolicyStubSettings.java @@ -489,14 +489,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 6928750..69ffe7d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -19,8 +19,8 @@ "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "d196f38277f745f7d99d468c5af0950bc9925b44", - "internalRef": "388499329" + "sha": "976c5ab6f24b58c91fe04847ead1953f99d19e6a", + "internalRef": "388535346" } }, {