Skip to content

Commit 631db48

Browse files
pongadpongad
authored
spanner: use method getters (#3299)
instead of deprecated fields. Original PR: googleapis/google-cloud-java#2989
1 parent e856c4f commit 631db48

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java

+23-23
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public Paginated<InstanceConfig> listInstanceConfigs(int pageSize, @Nullable Str
189189
ListInstanceConfigsResponse response =
190190
get(
191191
doUnaryCall(
192-
InstanceAdminGrpc.METHOD_LIST_INSTANCE_CONFIGS,
192+
InstanceAdminGrpc.getListInstanceConfigsMethod(),
193193
request.build(),
194194
projectName(),
195195
null));
@@ -201,7 +201,7 @@ public InstanceConfig getInstanceConfig(String instanceConfigName) throws Spanne
201201
GetInstanceConfigRequest request =
202202
GetInstanceConfigRequest.newBuilder().setName(instanceConfigName).build();
203203
return get(
204-
doUnaryCall(InstanceAdminGrpc.METHOD_GET_INSTANCE_CONFIG, request, projectName(), null));
204+
doUnaryCall(InstanceAdminGrpc.getGetInstanceConfigMethod(), request, projectName(), null));
205205
}
206206

207207
@Override
@@ -218,7 +218,7 @@ public Paginated<Instance> listInstances(
218218
ListInstancesResponse response =
219219
get(
220220
doUnaryCall(
221-
InstanceAdminGrpc.METHOD_LIST_INSTANCES, request.build(), projectName(), null));
221+
InstanceAdminGrpc.getListInstancesMethod(), request.build(), projectName(), null));
222222
return new Paginated<>(response.getInstancesList(), response.getNextPageToken());
223223
}
224224

@@ -231,22 +231,22 @@ public Operation createInstance(String parent, String instanceId, Instance insta
231231
.setInstanceId(instanceId)
232232
.setInstance(instance)
233233
.build();
234-
return get(doUnaryCall(InstanceAdminGrpc.METHOD_CREATE_INSTANCE, request, parent, null));
234+
return get(doUnaryCall(InstanceAdminGrpc.getCreateInstanceMethod(), request, parent, null));
235235
}
236236

237237
@Override
238238
public Operation updateInstance(Instance instance, FieldMask fieldMask) throws SpannerException {
239239
UpdateInstanceRequest request =
240240
UpdateInstanceRequest.newBuilder().setInstance(instance).setFieldMask(fieldMask).build();
241241
return get(
242-
doUnaryCall(InstanceAdminGrpc.METHOD_UPDATE_INSTANCE, request, instance.getName(), null));
242+
doUnaryCall(InstanceAdminGrpc.getUpdateInstanceMethod(), request, instance.getName(), null));
243243
}
244244

245245
@Override
246246
public Instance getInstance(String instanceName) throws SpannerException {
247247
return get(
248248
doUnaryCall(
249-
InstanceAdminGrpc.METHOD_GET_INSTANCE,
249+
InstanceAdminGrpc.getGetInstanceMethod(),
250250
GetInstanceRequest.newBuilder().setName(instanceName).build(),
251251
instanceName,
252252
null));
@@ -256,7 +256,7 @@ public Instance getInstance(String instanceName) throws SpannerException {
256256
public void deleteInstance(String instanceName) throws SpannerException {
257257
get(
258258
doUnaryCall(
259-
InstanceAdminGrpc.METHOD_DELETE_INSTANCE,
259+
InstanceAdminGrpc.getDeleteInstanceMethod(),
260260
DeleteInstanceRequest.newBuilder().setName(instanceName).build(),
261261
instanceName,
262262
null));
@@ -273,7 +273,7 @@ public Paginated<Database> listDatabases(
273273
com.google.spanner.admin.database.v1.ListDatabasesResponse response =
274274
get(
275275
doUnaryCall(
276-
DatabaseAdminGrpc.METHOD_LIST_DATABASES, builder.build(), instanceName, null));
276+
DatabaseAdminGrpc.getListDatabasesMethod(), builder.build(), instanceName, null));
277277
return new Paginated<>(response.getDatabasesList(), response.getNextPageToken());
278278
}
279279

@@ -287,7 +287,7 @@ public Operation createDatabase(
287287
.setCreateStatement(createDatabaseStatement)
288288
.addAllExtraStatements(additionalStatements)
289289
.build();
290-
return get(doUnaryCall(DatabaseAdminGrpc.METHOD_CREATE_DATABASE, request, instanceName, null));
290+
return get(doUnaryCall(DatabaseAdminGrpc.getCreateDatabaseMethod(), request, instanceName, null));
291291
}
292292

293293
@Override
@@ -301,14 +301,14 @@ public Operation updateDatabaseDdl(
301301
.setOperationId(MoreObjects.firstNonNull(operationId, ""))
302302
.build();
303303
return get(
304-
doUnaryCall(DatabaseAdminGrpc.METHOD_UPDATE_DATABASE_DDL, request, databaseName, null));
304+
doUnaryCall(DatabaseAdminGrpc.getUpdateDatabaseDdlMethod(), request, databaseName, null));
305305
}
306306

307307
@Override
308308
public void dropDatabase(String databaseName) throws SpannerException {
309309
get(
310310
doUnaryCall(
311-
DatabaseAdminGrpc.METHOD_DROP_DATABASE,
311+
DatabaseAdminGrpc.getDropDatabaseMethod(),
312312
DropDatabaseRequest.newBuilder().setDatabase(databaseName).build(),
313313
databaseName,
314314
null));
@@ -318,15 +318,15 @@ public void dropDatabase(String databaseName) throws SpannerException {
318318
public List<String> getDatabaseDdl(String databaseName) throws SpannerException {
319319
GetDatabaseDdlRequest request =
320320
GetDatabaseDdlRequest.newBuilder().setDatabase(databaseName).build();
321-
return get(doUnaryCall(DatabaseAdminGrpc.METHOD_GET_DATABASE_DDL, request, databaseName, null))
321+
return get(doUnaryCall(DatabaseAdminGrpc.getGetDatabaseDdlMethod(), request, databaseName, null))
322322
.getStatementsList();
323323
}
324324

325325
@Override
326326
public Database getDatabase(String databaseName) throws SpannerException {
327327
return get(
328328
doUnaryCall(
329-
DatabaseAdminGrpc.METHOD_GET_DATABASE,
329+
DatabaseAdminGrpc.getGetDatabaseMethod(),
330330
GetDatabaseRequest.newBuilder().setName(databaseName).build(),
331331
databaseName,
332332
null));
@@ -335,7 +335,7 @@ public Database getDatabase(String databaseName) throws SpannerException {
335335
@Override
336336
public Operation getOperation(String name) throws SpannerException {
337337
GetOperationRequest request = GetOperationRequest.newBuilder().setName(name).build();
338-
return get(doUnaryCall(OperationsGrpc.METHOD_GET_OPERATION, request, name, null));
338+
return get(doUnaryCall(OperationsGrpc.getGetOperationMethod(), request, name, null));
339339
}
340340

341341
@Override
@@ -349,7 +349,7 @@ public Session createSession(
349349
}
350350
return get(
351351
doUnaryCall(
352-
SpannerGrpc.METHOD_CREATE_SESSION,
352+
SpannerGrpc.getCreateSessionMethod(),
353353
request.build(),
354354
databaseName,
355355
Option.CHANNEL_HINT.getLong(options)));
@@ -360,7 +360,7 @@ public void deleteSession(String sessionName, @Nullable Map<Option, ?> options)
360360
DeleteSessionRequest request = DeleteSessionRequest.newBuilder().setName(sessionName).build();
361361
get(
362362
doUnaryCall(
363-
SpannerGrpc.METHOD_DELETE_SESSION,
363+
SpannerGrpc.getDeleteSessionMethod(),
364364
request,
365365
sessionName,
366366
Option.CHANNEL_HINT.getLong(options)));
@@ -370,7 +370,7 @@ public void deleteSession(String sessionName, @Nullable Map<Option, ?> options)
370370
public StreamingCall read(
371371
ReadRequest request, ResultStreamConsumer consumer, @Nullable Map<Option, ?> options) {
372372
return doStreamingCall(
373-
SpannerGrpc.METHOD_STREAMING_READ,
373+
SpannerGrpc.getStreamingReadMethod(),
374374
request,
375375
consumer,
376376
request.getSession(),
@@ -381,7 +381,7 @@ public StreamingCall read(
381381
public StreamingCall executeQuery(
382382
ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map<Option, ?> options) {
383383
return doStreamingCall(
384-
SpannerGrpc.METHOD_EXECUTE_STREAMING_SQL,
384+
SpannerGrpc.getExecuteStreamingSqlMethod(),
385385
request,
386386
consumer,
387387
request.getSession(),
@@ -393,7 +393,7 @@ public Transaction beginTransaction(
393393
BeginTransactionRequest request, @Nullable Map<Option, ?> options) {
394394
return get(
395395
doUnaryCall(
396-
SpannerGrpc.METHOD_BEGIN_TRANSACTION,
396+
SpannerGrpc.getBeginTransactionMethod(),
397397
request,
398398
request.getSession(),
399399
Option.CHANNEL_HINT.getLong(options)));
@@ -403,7 +403,7 @@ public Transaction beginTransaction(
403403
public CommitResponse commit(CommitRequest commitRequest, @Nullable Map<Option, ?> options) {
404404
return get(
405405
doUnaryCall(
406-
SpannerGrpc.METHOD_COMMIT,
406+
SpannerGrpc.getCommitMethod(),
407407
commitRequest,
408408
commitRequest.getSession(),
409409
Option.CHANNEL_HINT.getLong(options)));
@@ -413,7 +413,7 @@ public CommitResponse commit(CommitRequest commitRequest, @Nullable Map<Option,
413413
public void rollback(RollbackRequest request, @Nullable Map<Option, ?> options) {
414414
get(
415415
doUnaryCall(
416-
SpannerGrpc.METHOD_ROLLBACK,
416+
SpannerGrpc.getRollbackMethod(),
417417
request,
418418
request.getSession(),
419419
Option.CHANNEL_HINT.getLong(options)));
@@ -425,7 +425,7 @@ public PartitionResponse partitionQuery(
425425
throws SpannerException {
426426
return get(
427427
doUnaryCall(
428-
SpannerGrpc.METHOD_PARTITION_QUERY,
428+
SpannerGrpc.getPartitionQueryMethod(),
429429
request,
430430
request.getSession(),
431431
Option.CHANNEL_HINT.getLong(options)));
@@ -437,7 +437,7 @@ public PartitionResponse partitionRead(
437437
throws SpannerException {
438438
return get(
439439
doUnaryCall(
440-
SpannerGrpc.METHOD_PARTITION_READ,
440+
SpannerGrpc.getPartitionReadMethod(),
441441
request,
442442
request.getSession(),
443443
Option.CHANNEL_HINT.getLong(options)));

0 commit comments

Comments
 (0)