Skip to content

Commit 1144d92

Browse files
andreamlinandrey-qlogic
andreamlin
authored and
andrey-qlogic
committed
---
yaml --- r: 23715 b: refs/heads/autosynth-firestore c: 08ca27f h: refs/heads/master i: 23713: c4ec577 23711: d7c482c
1 parent 82d2fb9 commit 1144d92

3 files changed

Lines changed: 49 additions & 14 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ refs/heads/autosynth-containeranalysis: af5b804492292b43372c9fe00386696136ccae89
130130
refs/heads/autosynth-datastore: d0fc1187000c7a50d8bddd89c3b7cdf1187ecb96
131131
refs/heads/autosynth-dialogflow: cb1ceeb3ec1a132d3096fc88d44b930a52130e18
132132
refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
133-
refs/heads/autosynth-firestore: 704c84ab979bbe616c807e26556f05e0673abe67
133+
refs/heads/autosynth-firestore: 08ca27f68f532c7ee9dcd1675a3c1f59fd6e3493
134134
refs/heads/autosynth-iot: f03bdd338a9056ca3b7ea6d9ca901649ba9aab78
135135
refs/heads/autosynth-kms: 2828edfe3d2c53dd6e71912eae8a53c87bf40c87
136136
refs/heads/autosynth-language: c3d990dd34d81e7e935041e7147fb9dd27f8a557

‎branches/autosynth-firestore/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.java‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -984,9 +984,44 @@ public final UnaryCallable<DeleteInstanceRequest, Operation> deleteInstanceCalla
984984
*
985985
* <pre><code>
986986
* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
987-
* String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
987+
* InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
988988
* FailoverInstanceRequest.DataProtectionMode dataProtectionMode = FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
989-
* Instance response = cloudRedisClient.failoverInstanceAsync(formattedName, dataProtectionMode).get();
989+
* Instance response = cloudRedisClient.failoverInstanceAsync(name, dataProtectionMode).get();
990+
* }
991+
* </code></pre>
992+
*
993+
* @param name Required. Redis instance resource name using the form:
994+
* `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id`
995+
* refers to a GCP region
996+
* @param dataProtectionMode Optional. Available data protection modes that the user can choose.
997+
* If it's unspecified, data protection mode will be LIMITED_DATA_LOSS by default.
998+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
999+
*/
1000+
@BetaApi(
1001+
"The surface for long-running operations is not stable yet and may change in the future.")
1002+
public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
1003+
InstanceName name, FailoverInstanceRequest.DataProtectionMode dataProtectionMode) {
1004+
1005+
FailoverInstanceRequest request =
1006+
FailoverInstanceRequest.newBuilder()
1007+
.setName(name == null ? null : name.toString())
1008+
.setDataProtectionMode(dataProtectionMode)
1009+
.build();
1010+
return failoverInstanceAsync(request);
1011+
}
1012+
1013+
// AUTO-GENERATED DOCUMENTATION AND METHOD
1014+
/**
1015+
* Failover the master role to current replica node against a specific STANDARD tier redis
1016+
* instance.
1017+
*
1018+
* <p>Sample code:
1019+
*
1020+
* <pre><code>
1021+
* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
1022+
* InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
1023+
* FailoverInstanceRequest.DataProtectionMode dataProtectionMode = FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
1024+
* Instance response = cloudRedisClient.failoverInstanceAsync(name.toString(), dataProtectionMode).get();
9901025
* }
9911026
* </code></pre>
9921027
*
@@ -1019,10 +1054,10 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
10191054
*
10201055
* <pre><code>
10211056
* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
1022-
* String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
1057+
* InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
10231058
* FailoverInstanceRequest.DataProtectionMode dataProtectionMode = FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
10241059
* FailoverInstanceRequest request = FailoverInstanceRequest.newBuilder()
1025-
* .setName(formattedName)
1060+
* .setName(name.toString())
10261061
* .setDataProtectionMode(dataProtectionMode)
10271062
* .build();
10281063
* Instance response = cloudRedisClient.failoverInstanceAsync(request).get();
@@ -1048,10 +1083,10 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
10481083
*
10491084
* <pre><code>
10501085
* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
1051-
* String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
1086+
* InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
10521087
* FailoverInstanceRequest.DataProtectionMode dataProtectionMode = FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
10531088
* FailoverInstanceRequest request = FailoverInstanceRequest.newBuilder()
1054-
* .setName(formattedName)
1089+
* .setName(name.toString())
10551090
* .setDataProtectionMode(dataProtectionMode)
10561091
* .build();
10571092
* OperationFuture&lt;Instance, OperationMetadata&gt; future = cloudRedisClient.failoverInstanceOperationCallable().futureCall(request);
@@ -1075,10 +1110,10 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
10751110
*
10761111
* <pre><code>
10771112
* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
1078-
* String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
1113+
* InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
10791114
* FailoverInstanceRequest.DataProtectionMode dataProtectionMode = FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
10801115
* FailoverInstanceRequest request = FailoverInstanceRequest.newBuilder()
1081-
* .setName(formattedName)
1116+
* .setName(name.toString())
10821117
* .setDataProtectionMode(dataProtectionMode)
10831118
* .build();
10841119
* ApiFuture&lt;Operation&gt; future = cloudRedisClient.failoverInstanceCallable().futureCall(request);

‎branches/autosynth-firestore/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/CloudRedisClientTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,18 +446,18 @@ public void failoverInstanceTest() throws Exception {
446446
.build();
447447
mockCloudRedis.addResponse(resultOperation);
448448

449-
String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
449+
InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
450450
FailoverInstanceRequest.DataProtectionMode dataProtectionMode =
451451
FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
452452

453-
Instance actualResponse = client.failoverInstanceAsync(formattedName, dataProtectionMode).get();
453+
Instance actualResponse = client.failoverInstanceAsync(name, dataProtectionMode).get();
454454
Assert.assertEquals(expectedResponse, actualResponse);
455455

456456
List<GeneratedMessageV3> actualRequests = mockCloudRedis.getRequests();
457457
Assert.assertEquals(1, actualRequests.size());
458458
FailoverInstanceRequest actualRequest = (FailoverInstanceRequest) actualRequests.get(0);
459459

460-
Assert.assertEquals(formattedName, actualRequest.getName());
460+
Assert.assertEquals(name, InstanceName.parse(actualRequest.getName()));
461461
Assert.assertEquals(dataProtectionMode, actualRequest.getDataProtectionMode());
462462
Assert.assertTrue(
463463
channelProvider.isHeaderSent(
@@ -472,11 +472,11 @@ public void failoverInstanceExceptionTest() throws Exception {
472472
mockCloudRedis.addException(exception);
473473

474474
try {
475-
String formattedName = InstanceName.format("[PROJECT]", "[LOCATION]", "[INSTANCE]");
475+
InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
476476
FailoverInstanceRequest.DataProtectionMode dataProtectionMode =
477477
FailoverInstanceRequest.DataProtectionMode.DATA_PROTECTION_MODE_UNSPECIFIED;
478478

479-
client.failoverInstanceAsync(formattedName, dataProtectionMode).get();
479+
client.failoverInstanceAsync(name, dataProtectionMode).get();
480480
Assert.fail("No exception raised");
481481
} catch (ExecutionException e) {
482482
Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());

0 commit comments

Comments
 (0)