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

feat(regen): adds ResourceName overloads for get/set/testIamPolicy methods #24

Merged
merged 4 commits into from Jan 3, 2020
Merged

feat(regen): adds ResourceName overloads for get/set/testIamPolicy methods #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
965b0bf
[CHANGE ME] Re-generated to pick up changes in the API or client lib…
yoshi-automation Nov 22, 2019
45354e6
fix: allow breaking changes to v2beta2 client
chingor13 Dec 27, 2019
b304212
fix: allow breaking changes to v2beta2 return types
chingor13 Dec 27, 2019
6ee3fd0
regen
chingor13 Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 83 additions & 0 deletions google-cloud-tasks/clirr-ignored-differences.xml
View file
Open in desktop
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksClient*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/GrpcCloudTasksStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/CloudTasksStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksClient$*</className>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksClient</className>
<method>com.google.cloud.tasks.v2beta2.CloudTasksClient$ListQueuesPagedResponse listQueues(com.google.cloud.tasks.v2beta2.ListQueuesRequest)</method>
<to>com.google.cloud.tasks.v2beta2.ListQueuesResponse</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksClient</className>
<method>com.google.cloud.tasks.v2beta2.CloudTasksClient$ListTasksPagedResponse listTasks(com.google.cloud.tasks.v2beta2.ListTasksRequest)</method>
<to>com.google.cloud.tasks.v2beta2.ListTasksResponse</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksSettings</className>
<method>com.google.api.gax.rpc.PagedCallSettings listQueuesSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksSettings</className>
<method>com.google.api.gax.rpc.PagedCallSettings listTasksSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksSettings$Builder</className>
<method>com.google.api.gax.rpc.PagedCallSettings$Builder listQueuesSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings$Builder</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/CloudTasksSettings$Builder</className>
<method>com.google.api.gax.rpc.PagedCallSettings$Builder listTasksSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings$Builder</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings</className>
<method>com.google.api.gax.rpc.PagedCallSettings listQueuesSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings</className>
<method>com.google.api.gax.rpc.PagedCallSettings listTasksSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings$Builder</className>
<method>com.google.api.gax.rpc.PagedCallSettings$Builder listQueuesSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings$Builder</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/tasks/v2beta2/stub/CloudTasksStubSettings$Builder</className>
<method>com.google.api.gax.rpc.PagedCallSettings$Builder listTasksSettings()</method>
<to>com.google.api.gax.rpc.UnaryCallSettings$Builder</to>
</difference>
</differences>
44 changes: 29 additions & 15 deletions google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2/CloudTasksClient.java
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@
import com.google.api.gax.paging.AbstractPagedListResponse;
import com.google.api.gax.rpc.PageContext;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.api.resourcenames.ResourceName;
import com.google.cloud.tasks.v2.stub.CloudTasksStub;
import com.google.cloud.tasks.v2.stub.CloudTasksStubSettings;
import com.google.common.util.concurrent.MoreExecutors;
Expand Down Expand Up @@ -1126,7 +1127,7 @@ public final UnaryCallable<ResumeQueueRequest, Queue> resumeQueueCallable() {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy response = cloudTasksClient.getIamPolicy(resource);
* }
* </code></pre>
Expand All @@ -1135,7 +1136,7 @@ public final UnaryCallable<ResumeQueueRequest, Queue> resumeQueueCallable() {
* operation documentation for the appropriate value for this field.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final Policy getIamPolicy(QueueName resource) {
public final Policy getIamPolicy(ResourceName resource) {

GetIamPolicyRequest request =
GetIamPolicyRequest.newBuilder()
Expand All @@ -1158,7 +1159,7 @@ public final Policy getIamPolicy(QueueName resource) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy response = cloudTasksClient.getIamPolicy(resource.toString());
* }
* </code></pre>
Expand Down Expand Up @@ -1187,7 +1188,7 @@ public final Policy getIamPolicy(String resource) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
* .setResource(resource.toString())
* .build();
Expand All @@ -1202,6 +1203,10 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
return getIamPolicyCallable().call(request);
}

public final Policy getIamPolicy(QueueName queueName) {
return getIamPolicy((ResourceName) queueName);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
* Gets the access control policy for a [Queue][google.cloud.tasks.v2.Queue]. Returns an empty
Expand All @@ -1216,7 +1221,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
* .setResource(resource.toString())
* .build();
Expand Down Expand Up @@ -1247,7 +1252,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy policy = Policy.newBuilder().build();
* Policy response = cloudTasksClient.setIamPolicy(resource, policy);
* }
Expand All @@ -1260,7 +1265,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
* Platform services (such as Projects) might reject them.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final Policy setIamPolicy(QueueName resource, Policy policy) {
public final Policy setIamPolicy(ResourceName resource, Policy policy) {

SetIamPolicyRequest request =
SetIamPolicyRequest.newBuilder()
Expand All @@ -1287,7 +1292,7 @@ public final Policy setIamPolicy(QueueName resource, Policy policy) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy policy = Policy.newBuilder().build();
* Policy response = cloudTasksClient.setIamPolicy(resource.toString(), policy);
* }
Expand Down Expand Up @@ -1324,7 +1329,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy policy = Policy.newBuilder().build();
* SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
* .setResource(resource.toString())
Expand All @@ -1341,6 +1346,10 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
return setIamPolicyCallable().call(request);
}

public final Policy setIamPolicy(QueueName queue, Policy policy) {
return setIamPolicy((ResourceName) queue, policy);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
* Sets the access control policy for a [Queue][google.cloud.tasks.v2.Queue]. Replaces any
Expand All @@ -1358,7 +1367,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* Policy policy = Policy.newBuilder().build();
* SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
* .setResource(resource.toString())
Expand Down Expand Up @@ -1388,7 +1397,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
* TestIamPermissionsResponse response = cloudTasksClient.testIamPermissions(resource, permissions);
* }
Expand All @@ -1402,7 +1411,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final TestIamPermissionsResponse testIamPermissions(
QueueName resource, List<String> permissions) {
ResourceName resource, List<String> permissions) {

TestIamPermissionsRequest request =
TestIamPermissionsRequest.newBuilder()
Expand All @@ -1426,7 +1435,7 @@ public final TestIamPermissionsResponse testIamPermissions(
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* QueueName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
* TestIamPermissionsResponse response = cloudTasksClient.testIamPermissions(resource.toString(), permissions);
* }
Expand Down Expand Up @@ -1464,7 +1473,7 @@ public final TestIamPermissionsResponse testIamPermissions(
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
* TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
* .setResource(resource.toString())
Expand All @@ -1481,6 +1490,11 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
return testIamPermissionsCallable().call(request);
}

public final TestIamPermissionsResponse testIamPermissions(
QueueName queue, List<String> permissions) {
return testIamPermissions((ResourceName) queue, permissions);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
* Returns permissions that a caller has on a [Queue][google.cloud.tasks.v2.Queue]. If the
Expand All @@ -1495,7 +1509,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
*
* <pre><code>
* try (CloudTasksClient cloudTasksClient = CloudTasksClient.create()) {
* ResourceName resource = QueueName.of("[PROJECT]", "[LOCATION]", "[QUEUE]");
* ResourceName resource = LocationName.of("[PROJECT]", "[LOCATION]");
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
* TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
* .setResource(resource.toString())
Expand Down
8 changes: 4 additions & 4 deletions google-cloud-tasks/src/main/java/com/google/cloud/tasks/v2/stub/CloudTasksStubSettings.java
View file
Open in desktop
Expand Up @@ -556,7 +556,7 @@ private static Builder initDefaults(Builder builder) {

builder
.deleteQueueSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));

builder
Expand All @@ -576,7 +576,7 @@ private static Builder initDefaults(Builder builder) {

builder
.getIamPolicySettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));

builder
Expand All @@ -586,7 +586,7 @@ private static Builder initDefaults(Builder builder) {

builder
.testIamPermissionsSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));

builder
Expand All @@ -606,7 +606,7 @@ private static Builder initDefaults(Builder builder) {

builder
.deleteTaskSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));

builder
Expand Down