Skip to content

Commit 9b9fb63

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(deps): upgrade gapic-generator-java to 2.6.1 and update gax-java to 2.12.2 (#1176)
* chore(deps): upgrade gapic-generator-java to 2.6.1 and update gax-java to 2.12.2 PiperOrigin-RevId: 428569213 Source-Link: googleapis/googleapis@3ec9414 Source-Link: https://github.com/googleapis/googleapis-gen/commit/92ccb615975e2115882fe1ed3737b346dd4cd906 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTJjY2I2MTU5NzVlMjExNTg4MmZlMWVkMzczN2IzNDZkZDRjZDkwNiJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent b53cece commit 9b9fb63

File tree

7 files changed

+287
-152
lines changed

7 files changed

+287
-152
lines changed

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

+68-19
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import com.google.api.gax.grpc.GrpcCallSettings;
2323
import com.google.api.gax.grpc.GrpcStubCallableFactory;
2424
import com.google.api.gax.rpc.ClientContext;
25+
import com.google.api.gax.rpc.RequestParamsBuilder;
2526
import com.google.api.gax.rpc.ServerStreamingCallable;
2627
import com.google.api.gax.rpc.UnaryCallable;
28+
import com.google.api.pathtemplate.PathTemplate;
2729
import com.google.bigtable.v2.CheckAndMutateRowRequest;
2830
import com.google.bigtable.v2.CheckAndMutateRowResponse;
2931
import com.google.bigtable.v2.MutateRowRequest;
@@ -36,7 +38,6 @@
3638
import com.google.bigtable.v2.ReadRowsResponse;
3739
import com.google.bigtable.v2.SampleRowKeysRequest;
3840
import com.google.bigtable.v2.SampleRowKeysResponse;
39-
import com.google.common.collect.ImmutableMap;
4041
import com.google.longrunning.stub.GrpcOperationsStub;
4142
import io.grpc.MethodDescriptor;
4243
import io.grpc.protobuf.ProtoUtils;
@@ -123,6 +124,31 @@ public class GrpcBigtableStub extends BigtableStub {
123124
private final GrpcOperationsStub operationsStub;
124125
private final GrpcStubCallableFactory callableFactory;
125126

127+
private static final PathTemplate READ_ROWS_0_PATH_TEMPLATE =
128+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
129+
private static final PathTemplate READ_ROWS_1_PATH_TEMPLATE =
130+
PathTemplate.create("{app_profile_id=**}");
131+
private static final PathTemplate SAMPLE_ROW_KEYS_0_PATH_TEMPLATE =
132+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
133+
private static final PathTemplate SAMPLE_ROW_KEYS_1_PATH_TEMPLATE =
134+
PathTemplate.create("{app_profile_id=**}");
135+
private static final PathTemplate MUTATE_ROW_0_PATH_TEMPLATE =
136+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
137+
private static final PathTemplate MUTATE_ROW_1_PATH_TEMPLATE =
138+
PathTemplate.create("{app_profile_id=**}");
139+
private static final PathTemplate MUTATE_ROWS_0_PATH_TEMPLATE =
140+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
141+
private static final PathTemplate MUTATE_ROWS_1_PATH_TEMPLATE =
142+
PathTemplate.create("{app_profile_id=**}");
143+
private static final PathTemplate CHECK_AND_MUTATE_ROW_0_PATH_TEMPLATE =
144+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
145+
private static final PathTemplate CHECK_AND_MUTATE_ROW_1_PATH_TEMPLATE =
146+
PathTemplate.create("{app_profile_id=**}");
147+
private static final PathTemplate READ_MODIFY_WRITE_ROW_0_PATH_TEMPLATE =
148+
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
149+
private static final PathTemplate READ_MODIFY_WRITE_ROW_1_PATH_TEMPLATE =
150+
PathTemplate.create("{app_profile_id=**}");
151+
126152
public static final GrpcBigtableStub create(BigtableStubSettings settings) throws IOException {
127153
return new GrpcBigtableStub(settings, ClientContext.create(settings));
128154
}
@@ -163,39 +189,48 @@ protected GrpcBigtableStub(
163189
.setMethodDescriptor(readRowsMethodDescriptor)
164190
.setParamsExtractor(
165191
request -> {
166-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
167-
params.put("table_name", String.valueOf(request.getTableName()));
168-
return params.build();
192+
RequestParamsBuilder builder = RequestParamsBuilder.create();
193+
builder.add(request.getTableName(), "table_name", READ_ROWS_0_PATH_TEMPLATE);
194+
builder.add(
195+
request.getAppProfileId(), "app_profile_id", READ_ROWS_1_PATH_TEMPLATE);
196+
return builder.build();
169197
})
170198
.build();
171199
GrpcCallSettings<SampleRowKeysRequest, SampleRowKeysResponse> sampleRowKeysTransportSettings =
172200
GrpcCallSettings.<SampleRowKeysRequest, SampleRowKeysResponse>newBuilder()
173201
.setMethodDescriptor(sampleRowKeysMethodDescriptor)
174202
.setParamsExtractor(
175203
request -> {
176-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
177-
params.put("table_name", String.valueOf(request.getTableName()));
178-
return params.build();
204+
RequestParamsBuilder builder = RequestParamsBuilder.create();
205+
builder.add(
206+
request.getTableName(), "table_name", SAMPLE_ROW_KEYS_0_PATH_TEMPLATE);
207+
builder.add(
208+
request.getAppProfileId(), "app_profile_id", SAMPLE_ROW_KEYS_1_PATH_TEMPLATE);
209+
return builder.build();
179210
})
180211
.build();
181212
GrpcCallSettings<MutateRowRequest, MutateRowResponse> mutateRowTransportSettings =
182213
GrpcCallSettings.<MutateRowRequest, MutateRowResponse>newBuilder()
183214
.setMethodDescriptor(mutateRowMethodDescriptor)
184215
.setParamsExtractor(
185216
request -> {
186-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
187-
params.put("table_name", String.valueOf(request.getTableName()));
188-
return params.build();
217+
RequestParamsBuilder builder = RequestParamsBuilder.create();
218+
builder.add(request.getTableName(), "table_name", MUTATE_ROW_0_PATH_TEMPLATE);
219+
builder.add(
220+
request.getAppProfileId(), "app_profile_id", MUTATE_ROW_1_PATH_TEMPLATE);
221+
return builder.build();
189222
})
190223
.build();
191224
GrpcCallSettings<MutateRowsRequest, MutateRowsResponse> mutateRowsTransportSettings =
192225
GrpcCallSettings.<MutateRowsRequest, MutateRowsResponse>newBuilder()
193226
.setMethodDescriptor(mutateRowsMethodDescriptor)
194227
.setParamsExtractor(
195228
request -> {
196-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
197-
params.put("table_name", String.valueOf(request.getTableName()));
198-
return params.build();
229+
RequestParamsBuilder builder = RequestParamsBuilder.create();
230+
builder.add(request.getTableName(), "table_name", MUTATE_ROWS_0_PATH_TEMPLATE);
231+
builder.add(
232+
request.getAppProfileId(), "app_profile_id", MUTATE_ROWS_1_PATH_TEMPLATE);
233+
return builder.build();
199234
})
200235
.build();
201236
GrpcCallSettings<CheckAndMutateRowRequest, CheckAndMutateRowResponse>
@@ -204,9 +239,16 @@ protected GrpcBigtableStub(
204239
.setMethodDescriptor(checkAndMutateRowMethodDescriptor)
205240
.setParamsExtractor(
206241
request -> {
207-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
208-
params.put("table_name", String.valueOf(request.getTableName()));
209-
return params.build();
242+
RequestParamsBuilder builder = RequestParamsBuilder.create();
243+
builder.add(
244+
request.getTableName(),
245+
"table_name",
246+
CHECK_AND_MUTATE_ROW_0_PATH_TEMPLATE);
247+
builder.add(
248+
request.getAppProfileId(),
249+
"app_profile_id",
250+
CHECK_AND_MUTATE_ROW_1_PATH_TEMPLATE);
251+
return builder.build();
210252
})
211253
.build();
212254
GrpcCallSettings<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
@@ -215,9 +257,16 @@ protected GrpcBigtableStub(
215257
.setMethodDescriptor(readModifyWriteRowMethodDescriptor)
216258
.setParamsExtractor(
217259
request -> {
218-
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
219-
params.put("table_name", String.valueOf(request.getTableName()));
220-
return params.build();
260+
RequestParamsBuilder builder = RequestParamsBuilder.create();
261+
builder.add(
262+
request.getTableName(),
263+
"table_name",
264+
READ_MODIFY_WRITE_ROW_0_PATH_TEMPLATE);
265+
builder.add(
266+
request.getAppProfileId(),
267+
"app_profile_id",
268+
READ_MODIFY_WRITE_ROW_1_PATH_TEMPLATE);
269+
return builder.build();
221270
})
222271
.build();
223272

0 commit comments

Comments
 (0)