From 3cd680e7bea759fe0976672adb6999058b13eb33 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 10 Feb 2020 09:07:40 -0800 Subject: [PATCH] docs(regen): update sample code to set total timeout, add API client header test --- ...ptchaEnterpriseServiceV1Beta1Settings.java | 8 +- ...aEnterpriseServiceV1Beta1StubSettings.java | 8 +- ...chaEnterpriseServiceV1Beta1ClientTest.java | 232 ++++++++++++++++++ synth.metadata | 16 +- 4 files changed, 252 insertions(+), 12 deletions(-) diff --git a/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1Settings.java b/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1Settings.java index 6b8c2cd8..bd876e80 100644 --- a/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1Settings.java +++ b/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1Settings.java @@ -67,8 +67,12 @@ * * RecaptchaEnterpriseServiceV1Beta1Settings.Builder recaptchaEnterpriseServiceV1Beta1SettingsBuilder = * RecaptchaEnterpriseServiceV1Beta1Settings.newBuilder(); - * recaptchaEnterpriseServiceV1Beta1SettingsBuilder.createAssessmentSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * recaptchaEnterpriseServiceV1Beta1SettingsBuilder + * .createAssessmentSettings() + * .setRetrySettings( + * recaptchaEnterpriseServiceV1Beta1SettingsBuilder.createAssessmentSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * RecaptchaEnterpriseServiceV1Beta1Settings recaptchaEnterpriseServiceV1Beta1Settings = recaptchaEnterpriseServiceV1Beta1SettingsBuilder.build(); * * diff --git a/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/stub/RecaptchaEnterpriseServiceV1Beta1StubSettings.java b/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/stub/RecaptchaEnterpriseServiceV1Beta1StubSettings.java index a3510def..a8d06668 100644 --- a/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/stub/RecaptchaEnterpriseServiceV1Beta1StubSettings.java +++ b/google-cloud-recaptchaenterprise/src/main/java/com/google/cloud/recaptchaenterprise/v1beta1/stub/RecaptchaEnterpriseServiceV1Beta1StubSettings.java @@ -82,8 +82,12 @@ * * RecaptchaEnterpriseServiceV1Beta1StubSettings.Builder recaptchaEnterpriseServiceV1Beta1SettingsBuilder = * RecaptchaEnterpriseServiceV1Beta1StubSettings.newBuilder(); - * recaptchaEnterpriseServiceV1Beta1SettingsBuilder.createAssessmentSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * recaptchaEnterpriseServiceV1Beta1SettingsBuilder + * .createAssessmentSettings() + * .setRetrySettings( + * recaptchaEnterpriseServiceV1Beta1SettingsBuilder.createAssessmentSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * RecaptchaEnterpriseServiceV1Beta1StubSettings recaptchaEnterpriseServiceV1Beta1Settings = recaptchaEnterpriseServiceV1Beta1SettingsBuilder.build(); * * diff --git a/google-cloud-recaptchaenterprise/src/test/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1ClientTest.java b/google-cloud-recaptchaenterprise/src/test/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1ClientTest.java index 6f572a15..9f35da17 100644 --- a/google-cloud-recaptchaenterprise/src/test/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1ClientTest.java +++ b/google-cloud-recaptchaenterprise/src/test/java/com/google/cloud/recaptchaenterprise/v1beta1/RecaptchaEnterpriseServiceV1Beta1ClientTest.java @@ -15,6 +15,8 @@ */ package com.google.cloud.recaptchaenterprise.v1beta1; +import static com.google.cloud.recaptchaenterprise.v1beta1.RecaptchaEnterpriseServiceV1Beta1Client.ListKeysPagedResponse; + import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.GaxGrpcProperties; import com.google.api.gax.grpc.testing.LocalChannelProvider; @@ -22,13 +24,23 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.common.collect.Lists; import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Empty; import com.google.recaptchaenterprise.v1beta1.AnnotateAssessmentRequest; import com.google.recaptchaenterprise.v1beta1.AnnotateAssessmentResponse; import com.google.recaptchaenterprise.v1beta1.Assessment; import com.google.recaptchaenterprise.v1beta1.AssessmentName; import com.google.recaptchaenterprise.v1beta1.CreateAssessmentRequest; +import com.google.recaptchaenterprise.v1beta1.CreateKeyRequest; +import com.google.recaptchaenterprise.v1beta1.DeleteKeyRequest; +import com.google.recaptchaenterprise.v1beta1.GetKeyRequest; +import com.google.recaptchaenterprise.v1beta1.Key; +import com.google.recaptchaenterprise.v1beta1.KeyName; +import com.google.recaptchaenterprise.v1beta1.ListKeysRequest; +import com.google.recaptchaenterprise.v1beta1.ListKeysResponse; import com.google.recaptchaenterprise.v1beta1.ProjectName; +import com.google.recaptchaenterprise.v1beta1.UpdateKeyRequest; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -167,4 +179,224 @@ public void annotateAssessmentExceptionTest() throws Exception { // Expected exception } } + + @Test + @SuppressWarnings("all") + public void createKeyTest() { + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + String displayName = "displayName1615086568"; + Key expectedResponse = + Key.newBuilder().setName(name.toString()).setDisplayName(displayName).build(); + mockRecaptchaEnterpriseServiceV1Beta1.addResponse(expectedResponse); + + ProjectName parent = ProjectName.of("[PROJECT]"); + Key key = Key.newBuilder().build(); + CreateKeyRequest request = + CreateKeyRequest.newBuilder().setParent(parent.toString()).setKey(key).build(); + + Key actualResponse = client.createKey(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockRecaptchaEnterpriseServiceV1Beta1.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + CreateKeyRequest actualRequest = (CreateKeyRequest) actualRequests.get(0); + + Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent())); + Assert.assertEquals(key, actualRequest.getKey()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void createKeyExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockRecaptchaEnterpriseServiceV1Beta1.addException(exception); + + try { + ProjectName parent = ProjectName.of("[PROJECT]"); + Key key = Key.newBuilder().build(); + CreateKeyRequest request = + CreateKeyRequest.newBuilder().setParent(parent.toString()).setKey(key).build(); + + client.createKey(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void listKeysTest() { + String nextPageToken = ""; + Key keysElement = Key.newBuilder().build(); + List keys = Arrays.asList(keysElement); + ListKeysResponse expectedResponse = + ListKeysResponse.newBuilder().setNextPageToken(nextPageToken).addAllKeys(keys).build(); + mockRecaptchaEnterpriseServiceV1Beta1.addResponse(expectedResponse); + + ProjectName parent = ProjectName.of("[PROJECT]"); + ListKeysRequest request = ListKeysRequest.newBuilder().setParent(parent.toString()).build(); + + ListKeysPagedResponse pagedListResponse = client.listKeys(request); + + List resources = Lists.newArrayList(pagedListResponse.iterateAll()); + Assert.assertEquals(1, resources.size()); + Assert.assertEquals(expectedResponse.getKeysList().get(0), resources.get(0)); + + List actualRequests = mockRecaptchaEnterpriseServiceV1Beta1.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + ListKeysRequest actualRequest = (ListKeysRequest) actualRequests.get(0); + + Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void listKeysExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockRecaptchaEnterpriseServiceV1Beta1.addException(exception); + + try { + ProjectName parent = ProjectName.of("[PROJECT]"); + ListKeysRequest request = ListKeysRequest.newBuilder().setParent(parent.toString()).build(); + + client.listKeys(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void getKeyTest() { + KeyName name2 = KeyName.of("[PROJECT]", "[KEY]"); + String displayName = "displayName1615086568"; + Key expectedResponse = + Key.newBuilder().setName(name2.toString()).setDisplayName(displayName).build(); + mockRecaptchaEnterpriseServiceV1Beta1.addResponse(expectedResponse); + + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + GetKeyRequest request = GetKeyRequest.newBuilder().setName(name.toString()).build(); + + Key actualResponse = client.getKey(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockRecaptchaEnterpriseServiceV1Beta1.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + GetKeyRequest actualRequest = (GetKeyRequest) actualRequests.get(0); + + Assert.assertEquals(name, KeyName.parse(actualRequest.getName())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void getKeyExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockRecaptchaEnterpriseServiceV1Beta1.addException(exception); + + try { + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + GetKeyRequest request = GetKeyRequest.newBuilder().setName(name.toString()).build(); + + client.getKey(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void updateKeyTest() { + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + String displayName = "displayName1615086568"; + Key expectedResponse = + Key.newBuilder().setName(name.toString()).setDisplayName(displayName).build(); + mockRecaptchaEnterpriseServiceV1Beta1.addResponse(expectedResponse); + + Key key = Key.newBuilder().build(); + UpdateKeyRequest request = UpdateKeyRequest.newBuilder().setKey(key).build(); + + Key actualResponse = client.updateKey(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockRecaptchaEnterpriseServiceV1Beta1.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + UpdateKeyRequest actualRequest = (UpdateKeyRequest) actualRequests.get(0); + + Assert.assertEquals(key, actualRequest.getKey()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void updateKeyExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockRecaptchaEnterpriseServiceV1Beta1.addException(exception); + + try { + Key key = Key.newBuilder().build(); + UpdateKeyRequest request = UpdateKeyRequest.newBuilder().setKey(key).build(); + + client.updateKey(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void deleteKeyTest() { + Empty expectedResponse = Empty.newBuilder().build(); + mockRecaptchaEnterpriseServiceV1Beta1.addResponse(expectedResponse); + + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + DeleteKeyRequest request = DeleteKeyRequest.newBuilder().setName(name.toString()).build(); + + client.deleteKey(request); + + List actualRequests = mockRecaptchaEnterpriseServiceV1Beta1.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + DeleteKeyRequest actualRequest = (DeleteKeyRequest) actualRequests.get(0); + + Assert.assertEquals(name, KeyName.parse(actualRequest.getName())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void deleteKeyExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockRecaptchaEnterpriseServiceV1Beta1.addException(exception); + + try { + KeyName name = KeyName.of("[PROJECT]", "[KEY]"); + DeleteKeyRequest request = DeleteKeyRequest.newBuilder().setName(name.toString()).build(); + + client.deleteKey(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } } diff --git a/synth.metadata b/synth.metadata index b3f9585c..c674652a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,27 +1,27 @@ { - "updateTime": "2020-02-06T23:00:22.112674Z", + "updateTime": "2020-02-08T10:00:47.498975Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" + "version": "0.45.0", + "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" } }, { "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" } }, {