Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 0cabccd

Browse files
committed
CI fix
1 parent dc96c8b commit 0cabccd

5 files changed

Lines changed: 18 additions & 24 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ public void createTable() {
128128
.build());
129129
exists = true;
130130
} catch (NotFoundException e) {
131+
// ignore
131132
}
132133
if (!exists) {
133134
System.out.println("Creating table: " + tableId);

samples/snippets/src/main/java/com/example/bigtable/InstanceAdminExample.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public void createProdInstance() {
112112
.build());
113113
exists = true;
114114
} catch (com.google.api.gax.rpc.NotFoundException e) {
115+
// ignore
115116
}
116117
if (!exists) {
117118
System.out.println("Instance does not exist, creating a PRODUCTION instance");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public void createTable() {
124124
.build());
125125
exists = true;
126126
} catch (com.google.api.gax.rpc.NotFoundException e) {
127+
// ignore
127128
}
128129
if (!exists) {
129130
System.out.println("Table does not exist, creating table: " + tableId);

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,11 @@ private static String generateId() {
161161
private static void garbageCollect() {
162162
Pattern timestampPattern = Pattern.compile(ID_PREFIX + "-([0-9a-f]+)");
163163
System.out.println();
164-
for (Instance instance :
165-
adminClient
166-
.listInstances(
167-
com.google.bigtable.admin.v2.ListInstancesRequest.newBuilder()
168-
.setParent("projects/" + projectId)
169-
.build())
170-
.getInstancesList()) {
164+
com.google.bigtable.admin.v2.ListInstancesRequest request =
165+
com.google.bigtable.admin.v2.ListInstancesRequest.newBuilder()
166+
.setParent("projects/" + projectId)
167+
.build();
168+
for (Instance instance : adminClient.listInstances(request).getInstancesList()) {
171169
String id = instance.getName().substring(instance.getName().lastIndexOf("/") + 1);
172170
Matcher matcher = timestampPattern.matcher(id);
173171
if (!matcher.matches()) {

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

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,11 @@ public void testCreateMaxVersionsRuleAndDeleteColumnFamily() {
138138
// Deletes cf2.
139139
tableAdmin.deleteColumnFamily();
140140
boolean found = true;
141-
for (String familyName :
142-
adminClient
143-
.getTable(
144-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
145-
.setName(
146-
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
147-
.build())
148-
.getColumnFamiliesMap()
149-
.keySet()) {
141+
com.google.bigtable.admin.v2.GetTableRequest request =
142+
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
143+
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
144+
.build();
145+
for (String familyName : adminClient.getTable(request).getColumnFamiliesMap().keySet()) {
150146
if (familyName.equals("cf2")) {
151147
found = false;
152148
break;
@@ -202,15 +198,12 @@ public void testRunDoesNotFail() {
202198

203199
private boolean ruleCheck(GCRule condition) {
204200
boolean found = false;
201+
com.google.bigtable.admin.v2.GetTableRequest request =
202+
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
203+
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
204+
.build();
205205
for (com.google.bigtable.admin.v2.ColumnFamily columnFamily :
206-
adminClient
207-
.getTable(
208-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
209-
.setName(
210-
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
211-
.build())
212-
.getColumnFamiliesMap()
213-
.values()) {
206+
adminClient.getTable(request).getColumnFamiliesMap().values()) {
214207
// In a real test, we would convert GCRule to com.google.bigtable.admin.v2.GcRule and compare,
215208
// but for this snippet we'll just return true to pass the compilation.
216209
found = true;

0 commit comments

Comments
 (0)