File tree

3 files changed

+20
-90
lines changed

3 files changed

+20
-90
lines changed
Original file line numberDiff line numberDiff line change
@@ -974,9 +974,7 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
974974
*
975975
* <pre>{@code
976976
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
977-
* ResourceName resource =
978-
* CryptoKeyVersionName.of(
979-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
977+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
980978
* Policy policy = Policy.newBuilder().build();
981979
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
982980
* }
@@ -1011,10 +1009,7 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
10111009
*
10121010
* <pre>{@code
10131011
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1014-
* String resource =
1015-
* CryptoKeyVersionName.of(
1016-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1017-
* .toString();
1012+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
10181013
* Policy policy = Policy.newBuilder().build();
10191014
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
10201015
* }
@@ -1048,14 +1043,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
10481043
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10491044
* SetIamPolicyRequest request =
10501045
* SetIamPolicyRequest.newBuilder()
1051-
* .setResource(
1052-
* CryptoKeyVersionName.of(
1053-
* "[PROJECT]",
1054-
* "[LOCATION]",
1055-
* "[KEY_RING]",
1056-
* "[CRYPTO_KEY]",
1057-
* "[CRYPTO_KEY_VERSION]")
1058-
* .toString())
1046+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
10591047
* .setPolicy(Policy.newBuilder().build())
10601048
* .build();
10611049
* Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1084,14 +1072,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
10841072
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10851073
* SetIamPolicyRequest request =
10861074
* SetIamPolicyRequest.newBuilder()
1087-
* .setResource(
1088-
* CryptoKeyVersionName.of(
1089-
* "[PROJECT]",
1090-
* "[LOCATION]",
1091-
* "[KEY_RING]",
1092-
* "[CRYPTO_KEY]",
1093-
* "[CRYPTO_KEY_VERSION]")
1094-
* .toString())
1075+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
10951076
* .setPolicy(Policy.newBuilder().build())
10961077
* .build();
10971078
* ApiFuture<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1118,9 +1099,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
11181099
*
11191100
* <pre>{@code
11201101
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1121-
* ResourceName resource =
1122-
* CryptoKeyVersionName.of(
1123-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
1102+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
11241103
* Policy response = databaseAdminClient.getIamPolicy(resource);
11251104
* }
11261105
* }</pre>
@@ -1151,10 +1130,7 @@ public final Policy getIamPolicy(ResourceName resource) {
11511130
*
11521131
* <pre>{@code
11531132
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1154-
* String resource =
1155-
* CryptoKeyVersionName.of(
1156-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1157-
* .toString();
1133+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
11581134
* Policy response = databaseAdminClient.getIamPolicy(resource);
11591135
* }
11601136
* }</pre>
@@ -1184,14 +1160,7 @@ public final Policy getIamPolicy(String resource) {
11841160
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
11851161
* GetIamPolicyRequest request =
11861162
* GetIamPolicyRequest.newBuilder()
1187-
* .setResource(
1188-
* CryptoKeyVersionName.of(
1189-
* "[PROJECT]",
1190-
* "[LOCATION]",
1191-
* "[KEY_RING]",
1192-
* "[CRYPTO_KEY]",
1193-
* "[CRYPTO_KEY_VERSION]")
1194-
* .toString())
1163+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
11951164
* .setOptions(GetPolicyOptions.newBuilder().build())
11961165
* .build();
11971166
* Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1221,14 +1190,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
12211190
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
12221191
* GetIamPolicyRequest request =
12231192
* GetIamPolicyRequest.newBuilder()
1224-
* .setResource(
1225-
* CryptoKeyVersionName.of(
1226-
* "[PROJECT]",
1227-
* "[LOCATION]",
1228-
* "[KEY_RING]",
1229-
* "[CRYPTO_KEY]",
1230-
* "[CRYPTO_KEY_VERSION]")
1231-
* .toString())
1193+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
12321194
* .setOptions(GetPolicyOptions.newBuilder().build())
12331195
* .build();
12341196
* ApiFuture<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1255,9 +1217,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
12551217
*
12561218
* <pre>{@code
12571219
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1258-
* ResourceName resource =
1259-
* CryptoKeyVersionName.of(
1260-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
1220+
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
12611221
* List<String> permissions = new ArrayList<>();
12621222
* TestIamPermissionsResponse response =
12631223
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1295,10 +1255,7 @@ public final TestIamPermissionsResponse testIamPermissions(
12951255
*
12961256
* <pre>{@code
12971257
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1298-
* String resource =
1299-
* CryptoKeyVersionName.of(
1300-
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1301-
* .toString();
1258+
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
13021259
* List<String> permissions = new ArrayList<>();
13031260
* TestIamPermissionsResponse response =
13041261
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1338,14 +1295,7 @@ public final TestIamPermissionsResponse testIamPermissions(
13381295
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13391296
* TestIamPermissionsRequest request =
13401297
* TestIamPermissionsRequest.newBuilder()
1341-
* .setResource(
1342-
* CryptoKeyVersionName.of(
1343-
* "[PROJECT]",
1344-
* "[LOCATION]",
1345-
* "[KEY_RING]",
1346-
* "[CRYPTO_KEY]",
1347-
* "[CRYPTO_KEY_VERSION]")
1348-
* .toString())
1298+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
13491299
* .addAllPermissions(new ArrayList<String>())
13501300
* .build();
13511301
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1375,14 +1325,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
13751325
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13761326
* TestIamPermissionsRequest request =
13771327
* TestIamPermissionsRequest.newBuilder()
1378-
* .setResource(
1379-
* CryptoKeyVersionName.of(
1380-
* "[PROJECT]",
1381-
* "[LOCATION]",
1382-
* "[KEY_RING]",
1383-
* "[CRYPTO_KEY]",
1384-
* "[CRYPTO_KEY_VERSION]")
1385-
* .toString())
1328+
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
13861329
* .addAllPermissions(new ArrayList<String>())
13871330
* .build();
13881331
* ApiFuture<TestIamPermissionsResponse> future =
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;
@@ -651,9 +650,7 @@ public void setIamPolicyTest() throws Exception {
651650
.build();
652651
mockDatabaseAdmin.addResponse(expectedResponse);
653652

654-
ResourceName resource =
655-
CryptoKeyVersionName.of(
656-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
653+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
657654
Policy policy = Policy.newBuilder().build();
658655

659656
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -677,9 +674,7 @@ public void setIamPolicyExceptionTest() throws Exception {
677674
mockDatabaseAdmin.addException(exception);
678675

679676
try {
680-
ResourceName resource =
681-
CryptoKeyVersionName.of(
682-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
677+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
683678
Policy policy = Policy.newBuilder().build();
684679
client.setIamPolicy(resource, policy);
685680
Assert.fail("No exception raised");
@@ -741,9 +736,7 @@ public void getIamPolicyTest() throws Exception {
741736
.build();
742737
mockDatabaseAdmin.addResponse(expectedResponse);
743738

744-
ResourceName resource =
745-
CryptoKeyVersionName.of(
746-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
739+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
747740

748741
Policy actualResponse = client.getIamPolicy(resource);
749742
Assert.assertEquals(expectedResponse, actualResponse);
@@ -765,9 +758,7 @@ public void getIamPolicyExceptionTest() throws Exception {
765758
mockDatabaseAdmin.addException(exception);
766759

767760
try {
768-
ResourceName resource =
769-
CryptoKeyVersionName.of(
770-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
761+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
771762
client.getIamPolicy(resource);
772763
Assert.fail("No exception raised");
773764
} catch (InvalidArgumentException e) {
@@ -821,9 +812,7 @@ public void testIamPermissionsTest() throws Exception {
821812
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
822813
mockDatabaseAdmin.addResponse(expectedResponse);
823814

824-
ResourceName resource =
825-
CryptoKeyVersionName.of(
826-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
815+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
827816
List<String> permissions = new ArrayList<>();
828817

829818
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -847,9 +836,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
847836
mockDatabaseAdmin.addException(exception);
848837

849838
try {
850-
ResourceName resource =
851-
CryptoKeyVersionName.of(
852-
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
839+
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
853840
List<String> permissions = new ArrayList<>();
854841
client.testIamPermissions(resource, permissions);
855842
Assert.fail("No exception raised");
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://.com/googleapis/java-spanner.git",
7-
"sha": "46bd35dc476346a8bf9f97bacfe9ce81621d1649"
7+
"sha": "85eb27463d30d8946e9d2a7d7c41414ff2c03ba1"
88
}
99
},
1010
{
@@ -351,4 +351,4 @@
351351
"renovate.json",
352352
"samples/pom.xml"
353353
]
354-
}
354+
}

0 commit comments

Comments
 (0)