Skip to content

Commit bcf60c2

Browse files
chore: extract all table related request params extractors (#2402)
1 parent b40828c commit bcf60c2

File tree

1 file changed

+12
-73
lines changed

1 file changed

+12
-73
lines changed

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java

Lines changed: 12 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -603,22 +603,9 @@ private <ReqT, RowT> ServerStreamingCallable<ReadRowsRequest, RowT> createReadRo
603603
GrpcCallSettings.<ReadRowsRequest, ReadRowsResponse>newBuilder()
604604
.setMethodDescriptor(BigtableGrpc.getReadRowsMethod())
605605
.setParamsExtractor(
606-
new RequestParamsExtractor<ReadRowsRequest>() {
607-
@Override
608-
public Map<String, String> extract(ReadRowsRequest readRowsRequest) {
609-
String tableName = readRowsRequest.getTableName();
610-
String authorizedViewName = readRowsRequest.getAuthorizedViewName();
611-
if (tableName.isEmpty()) {
612-
tableName =
613-
NameUtil.extractTableNameFromAuthorizedViewName(authorizedViewName);
614-
}
615-
return ImmutableMap.of(
616-
"table_name",
617-
tableName,
618-
"app_profile_id",
619-
readRowsRequest.getAppProfileId());
620-
}
621-
})
606+
r ->
607+
composeRequestParams(
608+
r.getAppProfileId(), r.getTableName(), r.getAuthorizedViewName()))
622609
.build(),
623610
readRowsSettings.getRetryableCodes());
624611

@@ -742,25 +729,9 @@ public ApiFuture<List<KeyOffset>> futureCall(String s, ApiCallContext apiCallCon
742729
newBuilder()
743730
.setMethodDescriptor(BigtableGrpc.getSampleRowKeysMethod())
744731
.setParamsExtractor(
745-
new RequestParamsExtractor<com.google.bigtable.v2.SampleRowKeysRequest>() {
746-
@Override
747-
public Map<String, String> extract(
748-
com.google.bigtable.v2.SampleRowKeysRequest sampleRowKeysRequest) {
749-
String tableName = sampleRowKeysRequest.getTableName();
750-
String authorizedViewName =
751-
sampleRowKeysRequest.getAuthorizedViewName();
752-
if (tableName.isEmpty()) {
753-
tableName =
754-
NameUtil.extractTableNameFromAuthorizedViewName(
755-
authorizedViewName);
756-
}
757-
return ImmutableMap.of(
758-
"table_name",
759-
tableName,
760-
"app_profile_id",
761-
sampleRowKeysRequest.getAppProfileId());
762-
}
763-
})
732+
r ->
733+
composeRequestParams(
734+
r.getAppProfileId(), r.getTableName(), r.getAuthorizedViewName()))
764735
.build(),
765736
settings.sampleRowKeysSettings().getRetryableCodes());
766737

@@ -823,22 +794,9 @@ private UnaryCallable<BulkMutation, MutateRowsAttemptResult> createMutateRowsBas
823794
GrpcCallSettings.<MutateRowsRequest, MutateRowsResponse>newBuilder()
824795
.setMethodDescriptor(BigtableGrpc.getMutateRowsMethod())
825796
.setParamsExtractor(
826-
new RequestParamsExtractor<MutateRowsRequest>() {
827-
@Override
828-
public Map<String, String> extract(MutateRowsRequest mutateRowsRequest) {
829-
String tableName = mutateRowsRequest.getTableName();
830-
String authorizedViewName = mutateRowsRequest.getAuthorizedViewName();
831-
if (tableName.isEmpty()) {
832-
tableName =
833-
NameUtil.extractTableNameFromAuthorizedViewName(authorizedViewName);
834-
}
835-
return ImmutableMap.of(
836-
"table_name",
837-
tableName,
838-
"app_profile_id",
839-
mutateRowsRequest.getAppProfileId());
840-
}
841-
})
797+
r ->
798+
composeRequestParams(
799+
r.getAppProfileId(), r.getTableName(), r.getAuthorizedViewName()))
842800
.build(),
843801
settings.bulkMutateRowsSettings().getRetryableCodes());
844802

@@ -1075,18 +1033,7 @@ private UnaryCallable<ReadModifyWriteRow, Row> createReadModifyWriteRowCallable(
10751033
.setMethodDescriptor(
10761034
BigtableGrpc.getGenerateInitialChangeStreamPartitionsMethod())
10771035
.setParamsExtractor(
1078-
new RequestParamsExtractor<GenerateInitialChangeStreamPartitionsRequest>() {
1079-
@Override
1080-
public Map<String, String> extract(
1081-
GenerateInitialChangeStreamPartitionsRequest
1082-
generateInitialChangeStreamPartitionsRequest) {
1083-
return ImmutableMap.of(
1084-
"table_name",
1085-
generateInitialChangeStreamPartitionsRequest.getTableName(),
1086-
"app_profile_id",
1087-
generateInitialChangeStreamPartitionsRequest.getAppProfileId());
1088-
}
1089-
})
1036+
r -> composeRequestParams(r.getAppProfileId(), r.getTableName(), ""))
10901037
.build(),
10911038
settings.generateInitialChangeStreamPartitionsSettings().getRetryableCodes());
10921039

@@ -1155,15 +1102,7 @@ public Map<String, String> extract(
11551102
GrpcCallSettings.<ReadChangeStreamRequest, ReadChangeStreamResponse>newBuilder()
11561103
.setMethodDescriptor(BigtableGrpc.getReadChangeStreamMethod())
11571104
.setParamsExtractor(
1158-
new RequestParamsExtractor<ReadChangeStreamRequest>() {
1159-
@Override
1160-
public Map<String, String> extract(
1161-
ReadChangeStreamRequest readChangeStreamRequest) {
1162-
return ImmutableMap.of(
1163-
"table_name", readChangeStreamRequest.getTableName(),
1164-
"app_profile_id", readChangeStreamRequest.getAppProfileId());
1165-
}
1166-
})
1105+
r -> composeRequestParams(r.getAppProfileId(), r.getTableName(), ""))
11671106
.build(),
11681107
settings.readChangeStreamSettings().getRetryableCodes());
11691108

@@ -1313,7 +1252,7 @@ private <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUserFacin
13131252

13141253
private Map<String, String> composeRequestParams(
13151254
String appProfileId, String tableName, String authorizedViewName) {
1316-
if (tableName.isEmpty()) {
1255+
if (tableName.isEmpty() && !authorizedViewName.isEmpty()) {
13171256
tableName = NameUtil.extractTableNameFromAuthorizedViewName(authorizedViewName);
13181257
}
13191258
return ImmutableMap.of("table_name", tableName, "app_profile_id", appProfileId);

0 commit comments

Comments
 (0)