Skip to content

Commit e222dc1

Browse files
yoshi-automationyoshi-automation
committed
Regenerate bigtable client
1 parent b7c1878 commit e222dc1

File tree

2 files changed

+50
-37
lines changed

2 files changed

+50
-37
lines changed

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.google.bigtable.v2.RowFilter;
4141
import com.google.bigtable.v2.SampleRowKeysRequest;
4242
import com.google.bigtable.v2.SampleRowKeysResponse;
43-
import com.google.cloud.bigtable.data.v2.internal.NameUtil;
43+
import com.google.bigtable.v2.TableName;
4444
import com.google.protobuf.ByteString;
4545
import com.google.protobuf.GeneratedMessageV3;
4646
import io.grpc.Status;
@@ -101,8 +101,9 @@ public void readRowsTest() throws Exception {
101101
ReadRowsResponse expectedResponse =
102102
ReadRowsResponse.newBuilder().setLastScannedRowKey(lastScannedRowKey).build();
103103
mockBigtable.addResponse(expectedResponse);
104-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
105-
ReadRowsRequest request = ReadRowsRequest.newBuilder().setTableName(tableName).build();
104+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
105+
ReadRowsRequest request =
106+
ReadRowsRequest.newBuilder().setTableName(tableName.toString()).build();
106107

107108
MockStreamObserver<ReadRowsResponse> responseObserver = new MockStreamObserver<>();
108109

@@ -119,8 +120,9 @@ public void readRowsTest() throws Exception {
119120
public void readRowsExceptionTest() throws Exception {
120121
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
121122
mockBigtable.addException(exception);
122-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
123-
ReadRowsRequest request = ReadRowsRequest.newBuilder().setTableName(tableName).build();
123+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
124+
ReadRowsRequest request =
125+
ReadRowsRequest.newBuilder().setTableName(tableName.toString()).build();
124126

125127
MockStreamObserver<ReadRowsResponse> responseObserver = new MockStreamObserver<>();
126128

@@ -145,9 +147,9 @@ public void sampleRowKeysTest() throws Exception {
145147
SampleRowKeysResponse expectedResponse =
146148
SampleRowKeysResponse.newBuilder().setRowKey(rowKey).setOffsetBytes(offsetBytes).build();
147149
mockBigtable.addResponse(expectedResponse);
148-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
150+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
149151
SampleRowKeysRequest request =
150-
SampleRowKeysRequest.newBuilder().setTableName(tableName).build();
152+
SampleRowKeysRequest.newBuilder().setTableName(tableName.toString()).build();
151153

152154
MockStreamObserver<SampleRowKeysResponse> responseObserver = new MockStreamObserver<>();
153155

@@ -165,9 +167,9 @@ public void sampleRowKeysTest() throws Exception {
165167
public void sampleRowKeysExceptionTest() throws Exception {
166168
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
167169
mockBigtable.addException(exception);
168-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
170+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
169171
SampleRowKeysRequest request =
170-
SampleRowKeysRequest.newBuilder().setTableName(tableName).build();
172+
SampleRowKeysRequest.newBuilder().setTableName(tableName.toString()).build();
171173

172174
MockStreamObserver<SampleRowKeysResponse> responseObserver = new MockStreamObserver<>();
173175

@@ -191,7 +193,7 @@ public void mutateRowTest() {
191193
MutateRowResponse expectedResponse = MutateRowResponse.newBuilder().build();
192194
mockBigtable.addResponse(expectedResponse);
193195

194-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
196+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
195197
ByteString rowKey = ByteString.copyFromUtf8("122");
196198
List<Mutation> mutations = new ArrayList<>();
197199

@@ -202,7 +204,7 @@ public void mutateRowTest() {
202204
Assert.assertEquals(1, actualRequests.size());
203205
MutateRowRequest actualRequest = (MutateRowRequest) actualRequests.get(0);
204206

205-
Assert.assertEquals(tableName, actualRequest.getTableName());
207+
Assert.assertEquals(tableName, TableName.parse(actualRequest.getTableName()));
206208
Assert.assertEquals(rowKey, actualRequest.getRowKey());
207209
Assert.assertEquals(mutations, actualRequest.getMutationsList());
208210
Assert.assertTrue(
@@ -218,7 +220,7 @@ public void mutateRowExceptionTest() throws Exception {
218220
mockBigtable.addException(exception);
219221

220222
try {
221-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
223+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
222224
ByteString rowKey = ByteString.copyFromUtf8("122");
223225
List<Mutation> mutations = new ArrayList<>();
224226

@@ -234,10 +236,13 @@ public void mutateRowExceptionTest() throws Exception {
234236
public void mutateRowsTest() throws Exception {
235237
MutateRowsResponse expectedResponse = MutateRowsResponse.newBuilder().build();
236238
mockBigtable.addResponse(expectedResponse);
237-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
239+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
238240
List<MutateRowsRequest.Entry> entries = new ArrayList<>();
239241
MutateRowsRequest request =
240-
MutateRowsRequest.newBuilder().setTableName(tableName).addAllEntries(entries).build();
242+
MutateRowsRequest.newBuilder()
243+
.setTableName(tableName.toString())
244+
.addAllEntries(entries)
245+
.build();
241246

242247
MockStreamObserver<MutateRowsResponse> responseObserver = new MockStreamObserver<>();
243248

@@ -255,10 +260,13 @@ public void mutateRowsTest() throws Exception {
255260
public void mutateRowsExceptionTest() throws Exception {
256261
StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
257262
mockBigtable.addException(exception);
258-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
263+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
259264
List<MutateRowsRequest.Entry> entries = new ArrayList<>();
260265
MutateRowsRequest request =
261-
MutateRowsRequest.newBuilder().setTableName(tableName).addAllEntries(entries).build();
266+
MutateRowsRequest.newBuilder()
267+
.setTableName(tableName.toString())
268+
.addAllEntries(entries)
269+
.build();
262270

263271
MockStreamObserver<MutateRowsResponse> responseObserver = new MockStreamObserver<>();
264272

@@ -284,7 +292,7 @@ public void checkAndMutateRowTest() {
284292
CheckAndMutateRowResponse.newBuilder().setPredicateMatched(predicateMatched).build();
285293
mockBigtable.addResponse(expectedResponse);
286294

287-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
295+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
288296
ByteString rowKey = ByteString.copyFromUtf8("122");
289297
RowFilter predicateFilter = RowFilter.newBuilder().build();
290298
List<Mutation> trueMutations = new ArrayList<>();
@@ -298,7 +306,7 @@ public void checkAndMutateRowTest() {
298306
Assert.assertEquals(1, actualRequests.size());
299307
CheckAndMutateRowRequest actualRequest = (CheckAndMutateRowRequest) actualRequests.get(0);
300308

301-
Assert.assertEquals(tableName, actualRequest.getTableName());
309+
Assert.assertEquals(tableName, TableName.parse(actualRequest.getTableName()));
302310
Assert.assertEquals(rowKey, actualRequest.getRowKey());
303311
Assert.assertEquals(predicateFilter, actualRequest.getPredicateFilter());
304312
Assert.assertEquals(trueMutations, actualRequest.getTrueMutationsList());
@@ -316,7 +324,7 @@ public void checkAndMutateRowExceptionTest() throws Exception {
316324
mockBigtable.addException(exception);
317325

318326
try {
319-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
327+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
320328
ByteString rowKey = ByteString.copyFromUtf8("122");
321329
RowFilter predicateFilter = RowFilter.newBuilder().build();
322330
List<Mutation> trueMutations = new ArrayList<>();
@@ -335,7 +343,7 @@ public void readModifyWriteRowTest() {
335343
ReadModifyWriteRowResponse expectedResponse = ReadModifyWriteRowResponse.newBuilder().build();
336344
mockBigtable.addResponse(expectedResponse);
337345

338-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
346+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
339347
ByteString rowKey = ByteString.copyFromUtf8("122");
340348
List<ReadModifyWriteRule> rules = new ArrayList<>();
341349

@@ -346,7 +354,7 @@ public void readModifyWriteRowTest() {
346354
Assert.assertEquals(1, actualRequests.size());
347355
ReadModifyWriteRowRequest actualRequest = (ReadModifyWriteRowRequest) actualRequests.get(0);
348356

349-
Assert.assertEquals(tableName, actualRequest.getTableName());
357+
Assert.assertEquals(tableName, TableName.parse(actualRequest.getTableName()));
350358
Assert.assertEquals(rowKey, actualRequest.getRowKey());
351359
Assert.assertEquals(rules, actualRequest.getRulesList());
352360
Assert.assertTrue(
@@ -362,7 +370,7 @@ public void readModifyWriteRowExceptionTest() throws Exception {
362370
mockBigtable.addException(exception);
363371

364372
try {
365-
String tableName = NameUtil.formatTableName("[PROJECT]", "[INSTANCE]", "[TABLE]");
373+
TableName tableName = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
366374
ByteString rowKey = ByteString.copyFromUtf8("122");
367375
List<ReadModifyWriteRule> rules = new ArrayList<>();
368376

‎google-cloud-clients/google-cloud-bigtable/synth.metadata‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
{
2+
"updateTime": "2019-01-03T17:38:30.098745Z",
23
"sources": [
34
{
4-
"git": {
5-
"name": "googleapis",
6-
"remote": "https://github.com/googleapis/googleapis.git",
7-
"sha": "5a57f0c13a358b2b15452bf2d67453774a5f6d4f",
8-
"internalRef": "221837528"
5+
"generator": {
6+
"name": "artman",
7+
"version": "0.16.4",
8+
"dockerImage": "googleapis/artman@sha256:8b45fae963557c3299921037ecbb86f0689f41b1b4aea73408ebc50562cb2857"
99
}
1010
},
1111
{
1212
"git": {
13-
"name": "googleapis-private",
14-
"remote": "https://github.com/googleapis/googleapis-private.git",
15-
"sha": "6aa8e1a447bb8d0367150356a28cb4d3f2332641",
16-
"internalRef": "221340946"
13+
"name": "googleapis",
14+
"remote": "https://github.com/googleapis/googleapis.git",
15+
"sha": "2a5caab4315cb5ab3d5c97c90c6d4e9441052b16",
16+
"internalRef": "227195651"
1717
}
18-
},
18+
}
19+
],
20+
"destinations": [
1921
{
20-
"generator": {
21-
"name": "artman",
22-
"version": "0.16.0",
23-
"dockerImage": "googleapis/artman@sha256:90f9d15e9bad675aeecd586725bce48f5667ffe7d5fc4d1e96d51ff34304815b"
22+
"client": {
23+
"source": "googleapis",
24+
"apiName": "bigtable",
25+
"apiVersion": "v2",
26+
"language": "java",
27+
"generator": "gapic",
28+
"config": "google/bigtable/artman_bigtable.yaml"
2429
}
2530
}
2631
]
27-
}
32+
}

0 commit comments

Comments
 (0)