From 9d7dddc630a1b4c2d1b8330fdefd2297ac802019 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 10 Feb 2020 09:07:12 -0800 Subject: [PATCH] docs(regen): update sample code to set total timeout, add API client header test --- .../v1/AutoscalingPolicyServiceSettings.java | 8 +- .../v1/ClusterControllerSettings.java | 8 +- .../dataproc/v1/JobControllerSettings.java | 8 +- .../v1/WorkflowTemplateServiceSettings.java | 8 +- .../AutoscalingPolicyServiceStubSettings.java | 8 +- .../stub/ClusterControllerStubSettings.java | 8 +- .../v1/stub/JobControllerStubSettings.java | 8 +- .../WorkflowTemplateServiceStubSettings.java | 8 +- .../AutoscalingPolicyServiceSettings.java | 8 +- .../v1beta2/ClusterControllerSettings.java | 8 +- .../v1beta2/JobControllerSettings.java | 8 +- .../WorkflowTemplateServiceSettings.java | 8 +- .../AutoscalingPolicyServiceStubSettings.java | 8 +- .../stub/ClusterControllerStubSettings.java | 8 +- .../stub/JobControllerStubSettings.java | 8 +- .../WorkflowTemplateServiceStubSettings.java | 8 +- .../v1/ClusterControllerClientTest.java | 7 +- .../dataproc/v1/JobControllerClientTest.java | 82 ++++++++++++++++-- .../v1beta2/ClusterControllerClientTest.java | 7 +- .../v1beta2/JobControllerClientTest.java | 84 +++++++++++++++++-- synth.metadata | 12 +-- 21 files changed, 262 insertions(+), 58 deletions(-) diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java index 85e2694c..36d59fbf 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyServiceSettings.java @@ -55,8 +55,12 @@ * * AutoscalingPolicyServiceSettings.Builder autoscalingPolicyServiceSettingsBuilder = * AutoscalingPolicyServiceSettings.newBuilder(); - * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * autoscalingPolicyServiceSettingsBuilder + * .createAutoscalingPolicySettings() + * .setRetrySettings( + * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * AutoscalingPolicyServiceSettings autoscalingPolicyServiceSettings = autoscalingPolicyServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java index 13f1cf8f..8fb9b070 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java @@ -57,8 +57,12 @@ * * ClusterControllerSettings.Builder clusterControllerSettingsBuilder = * ClusterControllerSettings.newBuilder(); - * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * clusterControllerSettingsBuilder + * .getClusterSettings() + * .setRetrySettings( + * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ClusterControllerSettings clusterControllerSettings = clusterControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java index 0b59a84f..0bf1ecf0 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java @@ -55,8 +55,12 @@ * * JobControllerSettings.Builder jobControllerSettingsBuilder = * JobControllerSettings.newBuilder(); - * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * jobControllerSettingsBuilder + * .submitJobSettings() + * .setRetrySettings( + * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * JobControllerSettings jobControllerSettings = jobControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java index d3784406..0752f9e3 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceSettings.java @@ -57,8 +57,12 @@ * * WorkflowTemplateServiceSettings.Builder workflowTemplateServiceSettingsBuilder = * WorkflowTemplateServiceSettings.newBuilder(); - * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * workflowTemplateServiceSettingsBuilder + * .createWorkflowTemplateSettings() + * .setRetrySettings( + * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WorkflowTemplateServiceSettings workflowTemplateServiceSettings = workflowTemplateServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java index 4bed0c88..aece81fc 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/AutoscalingPolicyServiceStubSettings.java @@ -77,8 +77,12 @@ * * AutoscalingPolicyServiceStubSettings.Builder autoscalingPolicyServiceSettingsBuilder = * AutoscalingPolicyServiceStubSettings.newBuilder(); - * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * autoscalingPolicyServiceSettingsBuilder + * .createAutoscalingPolicySettings() + * .setRetrySettings( + * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * AutoscalingPolicyServiceStubSettings autoscalingPolicyServiceSettings = autoscalingPolicyServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java index 56eb63dc..54146695 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java @@ -85,8 +85,12 @@ * * ClusterControllerStubSettings.Builder clusterControllerSettingsBuilder = * ClusterControllerStubSettings.newBuilder(); - * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * clusterControllerSettingsBuilder + * .getClusterSettings() + * .setRetrySettings( + * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ClusterControllerStubSettings clusterControllerSettings = clusterControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java index 7dc10c0a..b17ca3bf 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java @@ -78,8 +78,12 @@ * * JobControllerStubSettings.Builder jobControllerSettingsBuilder = * JobControllerStubSettings.newBuilder(); - * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * jobControllerSettingsBuilder + * .submitJobSettings() + * .setRetrySettings( + * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * JobControllerStubSettings jobControllerSettings = jobControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java index a92494a5..75e12848 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java @@ -85,8 +85,12 @@ * * WorkflowTemplateServiceStubSettings.Builder workflowTemplateServiceSettingsBuilder = * WorkflowTemplateServiceStubSettings.newBuilder(); - * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * workflowTemplateServiceSettingsBuilder + * .createWorkflowTemplateSettings() + * .setRetrySettings( + * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WorkflowTemplateServiceStubSettings workflowTemplateServiceSettings = workflowTemplateServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java index 8d9254a4..bba18dee 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/AutoscalingPolicyServiceSettings.java @@ -55,8 +55,12 @@ * * AutoscalingPolicyServiceSettings.Builder autoscalingPolicyServiceSettingsBuilder = * AutoscalingPolicyServiceSettings.newBuilder(); - * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * autoscalingPolicyServiceSettingsBuilder + * .createAutoscalingPolicySettings() + * .setRetrySettings( + * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * AutoscalingPolicyServiceSettings autoscalingPolicyServiceSettings = autoscalingPolicyServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java index b8fb31a8..df553934 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerSettings.java @@ -57,8 +57,12 @@ * * ClusterControllerSettings.Builder clusterControllerSettingsBuilder = * ClusterControllerSettings.newBuilder(); - * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * clusterControllerSettingsBuilder + * .getClusterSettings() + * .setRetrySettings( + * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ClusterControllerSettings clusterControllerSettings = clusterControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java index cbba3c6d..8d7efd56 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerSettings.java @@ -55,8 +55,12 @@ * * JobControllerSettings.Builder jobControllerSettingsBuilder = * JobControllerSettings.newBuilder(); - * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * jobControllerSettingsBuilder + * .submitJobSettings() + * .setRetrySettings( + * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * JobControllerSettings jobControllerSettings = jobControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java index 112c1949..7aa5c284 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceSettings.java @@ -57,8 +57,12 @@ * * WorkflowTemplateServiceSettings.Builder workflowTemplateServiceSettingsBuilder = * WorkflowTemplateServiceSettings.newBuilder(); - * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * workflowTemplateServiceSettingsBuilder + * .createWorkflowTemplateSettings() + * .setRetrySettings( + * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WorkflowTemplateServiceSettings workflowTemplateServiceSettings = workflowTemplateServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java index df7b3de6..152cb69f 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/AutoscalingPolicyServiceStubSettings.java @@ -77,8 +77,12 @@ * * AutoscalingPolicyServiceStubSettings.Builder autoscalingPolicyServiceSettingsBuilder = * AutoscalingPolicyServiceStubSettings.newBuilder(); - * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * autoscalingPolicyServiceSettingsBuilder + * .createAutoscalingPolicySettings() + * .setRetrySettings( + * autoscalingPolicyServiceSettingsBuilder.createAutoscalingPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * AutoscalingPolicyServiceStubSettings autoscalingPolicyServiceSettings = autoscalingPolicyServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java index 3e4dac2b..53053ae6 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/ClusterControllerStubSettings.java @@ -85,8 +85,12 @@ * * ClusterControllerStubSettings.Builder clusterControllerSettingsBuilder = * ClusterControllerStubSettings.newBuilder(); - * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * clusterControllerSettingsBuilder + * .getClusterSettings() + * .setRetrySettings( + * clusterControllerSettingsBuilder.getClusterSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ClusterControllerStubSettings clusterControllerSettings = clusterControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java index 96edf784..63037617 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/JobControllerStubSettings.java @@ -78,8 +78,12 @@ * * JobControllerStubSettings.Builder jobControllerSettingsBuilder = * JobControllerStubSettings.newBuilder(); - * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * jobControllerSettingsBuilder + * .submitJobSettings() + * .setRetrySettings( + * jobControllerSettingsBuilder.submitJobSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * JobControllerStubSettings jobControllerSettings = jobControllerSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java index d92b7b43..c4619c37 100644 --- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java +++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/stub/WorkflowTemplateServiceStubSettings.java @@ -85,8 +85,12 @@ * * WorkflowTemplateServiceStubSettings.Builder workflowTemplateServiceSettingsBuilder = * WorkflowTemplateServiceStubSettings.newBuilder(); - * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * workflowTemplateServiceSettingsBuilder + * .createWorkflowTemplateSettings() + * .setRetrySettings( + * workflowTemplateServiceSettingsBuilder.createWorkflowTemplateSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * WorkflowTemplateServiceStubSettings workflowTemplateServiceSettings = workflowTemplateServiceSettingsBuilder.build(); * * diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java index 48e0c424..eefb9f01 100644 --- a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java +++ b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java @@ -391,9 +391,8 @@ public void listClustersTest2() { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - ListClustersPagedResponse pagedListResponse = client.listClusters(projectId, region, filter); + ListClustersPagedResponse pagedListResponse = client.listClusters(projectId, region); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); @@ -405,7 +404,6 @@ public void listClustersTest2() { Assert.assertEquals(projectId, actualRequest.getProjectId()); Assert.assertEquals(region, actualRequest.getRegion()); - Assert.assertEquals(filter, actualRequest.getFilter()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -421,9 +419,8 @@ public void listClustersExceptionTest2() throws Exception { try { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - client.listClusters(projectId, region, filter); + client.listClusters(projectId, region); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java index 2c5f549f..bb4c5f47 100644 --- a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java +++ b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.FieldMask; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -253,9 +254,8 @@ public void listJobsTest2() { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - ListJobsPagedResponse pagedListResponse = client.listJobs(projectId, region, filter); + ListJobsPagedResponse pagedListResponse = client.listJobs(projectId, region); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); @@ -267,7 +267,6 @@ public void listJobsTest2() { Assert.assertEquals(projectId, actualRequest.getProjectId()); Assert.assertEquals(region, actualRequest.getRegion()); - Assert.assertEquals(filter, actualRequest.getFilter()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -283,9 +282,82 @@ public void listJobsExceptionTest2() throws Exception { try { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - client.listJobs(projectId, region, filter); + client.listJobs(projectId, region); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void updateJobTest() { + String driverOutputResourceUri = "driverOutputResourceUri-542229086"; + String driverControlFilesUri = "driverControlFilesUri207057643"; + String jobUuid = "jobUuid-1615012099"; + Job expectedResponse = + Job.newBuilder() + .setDriverOutputResourceUri(driverOutputResourceUri) + .setDriverControlFilesUri(driverControlFilesUri) + .setJobUuid(jobUuid) + .build(); + mockJobController.addResponse(expectedResponse); + + String projectId = "projectId-1969970175"; + String region = "region-934795532"; + String jobId = "jobId-1154752291"; + Job job = Job.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + UpdateJobRequest request = + UpdateJobRequest.newBuilder() + .setProjectId(projectId) + .setRegion(region) + .setJobId(jobId) + .setJob(job) + .setUpdateMask(updateMask) + .build(); + + Job actualResponse = client.updateJob(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockJobController.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + UpdateJobRequest actualRequest = (UpdateJobRequest) actualRequests.get(0); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(region, actualRequest.getRegion()); + Assert.assertEquals(jobId, actualRequest.getJobId()); + Assert.assertEquals(job, actualRequest.getJob()); + Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void updateJobExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockJobController.addException(exception); + + try { + String projectId = "projectId-1969970175"; + String region = "region-934795532"; + String jobId = "jobId-1154752291"; + Job job = Job.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + UpdateJobRequest request = + UpdateJobRequest.newBuilder() + .setProjectId(projectId) + .setRegion(region) + .setJobId(jobId) + .setJob(job) + .setUpdateMask(updateMask) + .build(); + + client.updateJob(request); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java index 86e42579..f5941e31 100644 --- a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java +++ b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java @@ -391,9 +391,8 @@ public void listClustersTest2() { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - ListClustersPagedResponse pagedListResponse = client.listClusters(projectId, region, filter); + ListClustersPagedResponse pagedListResponse = client.listClusters(projectId, region); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); @@ -405,7 +404,6 @@ public void listClustersTest2() { Assert.assertEquals(projectId, actualRequest.getProjectId()); Assert.assertEquals(region, actualRequest.getRegion()); - Assert.assertEquals(filter, actualRequest.getFilter()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -421,9 +419,8 @@ public void listClustersExceptionTest2() throws Exception { try { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - client.listClusters(projectId, region, filter); + client.listClusters(projectId, region); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java index 7e5730b8..64e4cbd8 100644 --- a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java +++ b/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.FieldMask; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -257,9 +258,8 @@ public void listJobsTest2() { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - ListJobsPagedResponse pagedListResponse = client.listJobs(projectId, region, filter); + ListJobsPagedResponse pagedListResponse = client.listJobs(projectId, region); List resources = Lists.newArrayList(pagedListResponse.iterateAll()); Assert.assertEquals(1, resources.size()); @@ -271,7 +271,6 @@ public void listJobsTest2() { Assert.assertEquals(projectId, actualRequest.getProjectId()); Assert.assertEquals(region, actualRequest.getRegion()); - Assert.assertEquals(filter, actualRequest.getFilter()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -287,9 +286,84 @@ public void listJobsExceptionTest2() throws Exception { try { String projectId = "projectId-1969970175"; String region = "region-934795532"; - String filter = "filter-1274492040"; - client.listJobs(projectId, region, filter); + client.listJobs(projectId, region); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void updateJobTest() { + String submittedBy = "submittedBy-2047729125"; + String driverOutputResourceUri = "driverOutputResourceUri-542229086"; + String driverControlFilesUri = "driverControlFilesUri207057643"; + String jobUuid = "jobUuid-1615012099"; + Job expectedResponse = + Job.newBuilder() + .setSubmittedBy(submittedBy) + .setDriverOutputResourceUri(driverOutputResourceUri) + .setDriverControlFilesUri(driverControlFilesUri) + .setJobUuid(jobUuid) + .build(); + mockJobController.addResponse(expectedResponse); + + String projectId = "projectId-1969970175"; + String region = "region-934795532"; + String jobId = "jobId-1154752291"; + Job job = Job.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + UpdateJobRequest request = + UpdateJobRequest.newBuilder() + .setProjectId(projectId) + .setRegion(region) + .setJobId(jobId) + .setJob(job) + .setUpdateMask(updateMask) + .build(); + + Job actualResponse = client.updateJob(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockJobController.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + UpdateJobRequest actualRequest = (UpdateJobRequest) actualRequests.get(0); + + Assert.assertEquals(projectId, actualRequest.getProjectId()); + Assert.assertEquals(region, actualRequest.getRegion()); + Assert.assertEquals(jobId, actualRequest.getJobId()); + Assert.assertEquals(job, actualRequest.getJob()); + Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void updateJobExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockJobController.addException(exception); + + try { + String projectId = "projectId-1969970175"; + String region = "region-934795532"; + String jobId = "jobId-1154752291"; + Job job = Job.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + UpdateJobRequest request = + UpdateJobRequest.newBuilder() + .setProjectId(projectId) + .setRegion(region) + .setJobId(jobId) + .setJob(job) + .setUpdateMask(updateMask) + .build(); + + client.updateJob(request); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception diff --git a/synth.metadata b/synth.metadata index 7e335b57..04552961 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-02-06T22:48:01.665195Z", + "updateTime": "2020-02-08T09:48:22.132086Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" + "version": "0.45.0", + "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "2e23b8fbc45f5d9e200572ca662fe1271bcd6760", - "internalRef": "293666452", - "log": "2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n" + "sha": "e7d8a694f4559201e6913f6610069cb08b39274e", + "internalRef": "293903652", + "log": "e7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n" } }, {