Skip to content

Commit 688c59c

Browse files
yoshi-automationyoshi-automation
authored
chore: autosynth (#1321)
autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters.
1 parent 9cfe58c commit 688c59c

File tree

3 files changed

+19
-89
lines changed

3 files changed

+19
-89
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java‎

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -980,9 +980,7 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
980980
*
981981
* <pre>{@code
982982
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
983-
* ResourceName resource =
984-
* CryptoKeyVersionName.of(
985-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
983+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
986984
* Policy policy = Policy.newBuilder().build();
987985
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
988986
* }
@@ -1017,10 +1015,7 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
10171015
*
10181016
* <pre>{@code
10191017
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1020-
* String resource =
1021-
* CryptoKeyVersionName.of(
1022-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1023-
* .toString();
1018+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
10241019
* Policy policy = Policy.newBuilder().build();
10251020
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
10261021
* }
@@ -1054,14 +1049,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
10541049
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10551050
* SetIamPolicyRequest request =
10561051
* SetIamPolicyRequest.newBuilder()
1057-
* .setResource(
1058-
* CryptoKeyVersionName.of(
1059-
* "[PROJECT]",
1060-
* "[LOCATION]",
1061-
* "[KEY_RING]",
1062-
* "[CRYPTO_KEY]",
1063-
* "[CRYPTO_KEY_VERSION]")
1064-
* .toString())
1052+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
10651053
* .setPolicy(Policy.newBuilder().build())
10661054
* .build();
10671055
* Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1090,14 +1078,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
10901078
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10911079
* SetIamPolicyRequest request =
10921080
* SetIamPolicyRequest.newBuilder()
1093-
* .setResource(
1094-
* CryptoKeyVersionName.of(
1095-
* "[PROJECT]",
1096-
* "[LOCATION]",
1097-
* "[KEY_RING]",
1098-
* "[CRYPTO_KEY]",
1099-
* "[CRYPTO_KEY_VERSION]")
1100-
* .toString())
1081+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
11011082
* .setPolicy(Policy.newBuilder().build())
11021083
* .build();
11031084
* ApiFuture<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1124,9 +1105,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
11241105
*
11251106
* <pre>{@code
11261107
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1127-
* ResourceName resource =
1128-
* CryptoKeyVersionName.of(
1129-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
1108+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
11301109
* Policy response = databaseAdminClient.getIamPolicy(resource);
11311110
* }
11321111
* }</pre>
@@ -1157,10 +1136,7 @@ public final Policy getIamPolicy(ResourceName resource) {
11571136
*
11581137
* <pre>{@code
11591138
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1160-
* String resource =
1161-
* CryptoKeyVersionName.of(
1162-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1163-
* .toString();
1139+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
11641140
* Policy response = databaseAdminClient.getIamPolicy(resource);
11651141
* }
11661142
* }</pre>
@@ -1190,14 +1166,7 @@ public final Policy getIamPolicy(String resource) {
11901166
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
11911167
* GetIamPolicyRequest request =
11921168
* GetIamPolicyRequest.newBuilder()
1193-
* .setResource(
1194-
* CryptoKeyVersionName.of(
1195-
* "[PROJECT]",
1196-
* "[LOCATION]",
1197-
* "[KEY_RING]",
1198-
* "[CRYPTO_KEY]",
1199-
* "[CRYPTO_KEY_VERSION]")
1200-
* .toString())
1169+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
12011170
* .setOptions(GetPolicyOptions.newBuilder().build())
12021171
* .build();
12031172
* Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1227,14 +1196,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
12271196
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
12281197
* GetIamPolicyRequest request =
12291198
* GetIamPolicyRequest.newBuilder()
1230-
* .setResource(
1231-
* CryptoKeyVersionName.of(
1232-
* "[PROJECT]",
1233-
* "[LOCATION]",
1234-
* "[KEY_RING]",
1235-
* "[CRYPTO_KEY]",
1236-
* "[CRYPTO_KEY_VERSION]")
1237-
* .toString())
1199+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
12381200
* .setOptions(GetPolicyOptions.newBuilder().build())
12391201
* .build();
12401202
* ApiFuture<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1261,9 +1223,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
12611223
*
12621224
* <pre>{@code
12631225
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1264-
* ResourceName resource =
1265-
* CryptoKeyVersionName.of(
1266-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
1226+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
12671227
* List<String> permissions = new ArrayList<>();
12681228
* TestIamPermissionsResponse response =
12691229
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1301,10 +1261,7 @@ public final TestIamPermissionsResponse testIamPermissions(
13011261
*
13021262
* <pre>{@code
13031263
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1304-
* String resource =
1305-
* CryptoKeyVersionName.of(
1306-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1307-
* .toString();
1264+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
13081265
* List<String> permissions = new ArrayList<>();
13091266
* TestIamPermissionsResponse response =
13101267
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1344,14 +1301,7 @@ public final TestIamPermissionsResponse testIamPermissions(
13441301
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13451302
* TestIamPermissionsRequest request =
13461303
* TestIamPermissionsRequest.newBuilder()
1347-
* .setResource(
1348-
* CryptoKeyVersionName.of(
1349-
* "[PROJECT]",
1350-
* "[LOCATION]",
1351-
* "[KEY_RING]",
1352-
* "[CRYPTO_KEY]",
1353-
* "[CRYPTO_KEY_VERSION]")
1354-
* .toString())
1304+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
13551305
* .addAllPermissions(new ArrayList<String>())
13561306
* .build();
13571307
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1381,14 +1331,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
13811331
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13821332
* TestIamPermissionsRequest request =
13831333
* TestIamPermissionsRequest.newBuilder()
1384-
* .setResource(
1385-
* CryptoKeyVersionName.of(
1386-
* "[PROJECT]",
1387-
* "[LOCATION]",
1388-
* "[KEY_RING]",
1389-
* "[CRYPTO_KEY]",
1390-
* "[CRYPTO_KEY_VERSION]")
1391-
* .toString())
1334+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
13921335
* .addAllPermissions(new ArrayList<String>())
13931336
* .build();
13941337
* ApiFuture<TestIamPermissionsResponse> future =

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import com.google.spanner.admin.database.v1.BackupName;
4949
import com.google.spanner.admin.database.v1.CreateBackupRequest;
5050
import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
51-
import com.google.spanner.admin.database.v1.CryptoKeyVersionName;
5251
import com.google.spanner.admin.database.v1.Database;
5352
import com.google.spanner.admin.database.v1.DatabaseName;
5453
import com.google.spanner.admin.database.v1.DeleteBackupRequest;
@@ -655,9 +654,7 @@ public void setIamPolicyTest() throws Exception {
655654
.build();
656655
mockDatabaseAdmin.addResponse(expectedResponse);
657656

658-
ResourceName resource =
659-
CryptoKeyVersionName.of(
660-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
657+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
661658
Policy policy = Policy.newBuilder().build();
662659

663660
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -681,9 +678,7 @@ public void setIamPolicyExceptionTest() throws Exception {
681678
mockDatabaseAdmin.addException(exception);
682679

683680
try {
684-
ResourceName resource =
685-
CryptoKeyVersionName.of(
686-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
681+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
687682
Policy policy = Policy.newBuilder().build();
688683
client.setIamPolicy(resource, policy);
689684
Assert.fail("No exception raised");
@@ -745,9 +740,7 @@ public void getIamPolicyTest() throws Exception {
745740
.build();
746741
mockDatabaseAdmin.addResponse(expectedResponse);
747742

748-
ResourceName resource =
749-
CryptoKeyVersionName.of(
750-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
743+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
751744

752745
Policy actualResponse = client.getIamPolicy(resource);
753746
Assert.assertEquals(expectedResponse, actualResponse);
@@ -769,9 +762,7 @@ public void getIamPolicyExceptionTest() throws Exception {
769762
mockDatabaseAdmin.addException(exception);
770763

771764
try {
772-
ResourceName resource =
773-
CryptoKeyVersionName.of(
774-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
765+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
775766
client.getIamPolicy(resource);
776767
Assert.fail("No exception raised");
777768
} catch (InvalidArgumentException e) {
@@ -825,9 +816,7 @@ public void testIamPermissionsTest() throws Exception {
825816
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
826817
mockDatabaseAdmin.addResponse(expectedResponse);
827818

828-
ResourceName resource =
829-
CryptoKeyVersionName.of(
830-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
819+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
831820
List<String> permissions = new ArrayList<>();
832821

833822
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -851,9 +840,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
851840
mockDatabaseAdmin.addException(exception);
852841

853842
try {
854-
ResourceName resource =
855-
CryptoKeyVersionName.of(
856-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
843+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
857844
List<String> permissions = new ArrayList<>();
858845
client.testIamPermissions(resource, permissions);
859846
Assert.fail("No exception raised");

‎synth.metadata‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-spanner.git",
7-
"sha": "fc05137ea1db3e728ef9f7059cdfdd97d21e89d9"
7+
"sha": "b23e59a102dd8f4ac2184a496821f478cba11b64"
88
}
99
},
1010
{

0 commit comments

Comments
 (0)