Skip to content

Commit 922dd1d

Browse files
jinseopkim0jinseopkim0
committed
chore(bigtable-samples): address gemini-code-assist review feedback
1 parent 678aae4 commit 922dd1d

11 files changed

Lines changed: 26 additions & 14 deletions

File tree

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/AuthorizedViewExample.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ private boolean exists(String tableId) {
9292
adminClient.getTable(
9393
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
9494
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
95+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
9596
.build());
9697
return true;
9798
} catch (com.google.api.gax.rpc.NotFoundException e) {

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/HelloWorld.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public void createTable() {
125125
adminClient.getTable(
126126
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
127127
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
128+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
128129
.build());
129130
exists = true;
130131
} catch (NotFoundException e) {

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/SchemaBundleExample.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private boolean exists(String tableId) {
8787
adminClient.getTable(
8888
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
8989
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
90+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
9091
.build());
9192
return true;
9293
} catch (com.google.api.gax.rpc.NotFoundException e) {
@@ -157,8 +158,10 @@ public void createSchemaBundle() {
157158
} catch (NotFoundException exception) {
158159
System.out.printf("%nCreating schema bundle %s in table %s%n", schemaBundleId, tableId);
159160
// [START bigtable_create_schema_bundle]
160-
try {
161-
InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH);
161+
try (InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH)) {
162+
if (in == null) {
163+
throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH);
164+
}
162165
com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
163166
com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
164167
.setProtoSchema(
@@ -187,8 +190,10 @@ public void createSchemaBundle() {
187190
public void updateSchemaBundle() {
188191
System.out.printf("%nUpdating schema bundle %s in table %s%n", schemaBundleId, tableId);
189192
// [START bigtable_update_schema_bundle]
190-
try {
191-
InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH);
193+
try (InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH)) {
194+
if (in == null) {
195+
throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH);
196+
}
192197
com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
193198
com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
194199
.setName(

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/TableAdminExample.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void createTable() {
121121
adminClient.getTable(
122122
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
123123
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
124+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
124125
.build());
125126
exists = true;
126127
} catch (NotFoundException e) {

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/AuthorizedViewExampleTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ private static boolean exists(String tableId) {
7070
adminClient.getTable(
7171
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
7272
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
73+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
7374
.build());
7475
return true;
7576
} catch (com.google.api.gax.rpc.NotFoundException e) {

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/InstanceAdminExampleTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static org.junit.Assert.assertFalse;
2020
import static org.junit.Assert.assertNotNull;
21+
import static org.junit.Assert.assertThrows;
2122
import static org.junit.Assert.assertTrue;
2223

2324
import com.google.api.gax.rpc.NotFoundException;
@@ -131,7 +132,7 @@ public void testGetInstance() {
131132
assertNotNull(instance);
132133
}
133134

134-
@Test(expected = NotFoundException.class)
135+
@Test
135136
public void testAddAndDeleteCluster() {
136137
// Adds a cluster.
137138
instanceAdmin.addCluster();
@@ -142,8 +143,11 @@ public void testAddAndDeleteCluster() {
142143

143144
// Deletes a cluster.
144145
instanceAdmin.deleteCluster();
145-
adminClient.getCluster(
146-
"projects/" + projectId + "/instances/" + instanceId + "/clusters/" + CLUSTER);
146+
assertThrows(
147+
NotFoundException.class,
148+
() ->
149+
adminClient.getCluster(
150+
"projects/" + projectId + "/instances/" + instanceId + "/clusters/" + CLUSTER));
147151
}
148152

149153
// TODO: add test for instanceAdmin.listInstances()

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/MobileTimeSeriesBaseTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ public static void cleanupTable() throws IOException {
215215
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
216216
.setName(
217217
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + TABLE_ID)
218+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
218219
.build());
219220
} catch (com.google.api.gax.rpc.NotFoundException e) {
220221
exists = false;

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/QuickstartTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public static void beforeClass() throws IOException {
5050
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
5151
.setName(
5252
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + TABLE_ID)
53+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
5354
.build());
5455
} catch (com.google.api.gax.rpc.NotFoundException e) {
5556
exists = false;

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/SchemaBundleExampleTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ private static boolean exists(String tableId) {
5858
adminClient.getTable(
5959
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
6060
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
61+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
6162
.build());
6263
return true;
6364
} catch (com.google.api.gax.rpc.NotFoundException e) {

‎java-bigtable/samples/snippets/src/test/java/com/example/bigtable/TableAdminExampleTest.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ private static boolean exists(String tableId) {
5858
adminClient.getTable(
5959
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
6060
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
61+
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
6162
.build());
6263
return true;
6364
} catch (com.google.api.gax.rpc.NotFoundException e) {
@@ -137,17 +138,11 @@ public void testCreateMaxVersionsRuleAndDeleteColumnFamily() {
137138

138139
// Deletes cf2.
139140
tableAdmin.deleteColumnFamily();
140-
boolean found = true;
141141
com.google.bigtable.admin.v2.GetTableRequest request =
142142
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
143143
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
144144
.build();
145-
for (String familyName : adminClient.getTable(request).getColumnFamiliesMap().keySet()) {
146-
if (familyName.equals("cf2")) {
147-
found = false;
148-
break;
149-
}
150-
}
145+
boolean found = !adminClient.getTable(request).getColumnFamiliesMap().containsKey("cf2");
151146
assertTrue(found);
152147
}
153148

0 commit comments

Comments
 (0)