samples(bigtable): migrate all admin snippets and tests to modern V2 clients by jinseopkim0 · Pull Request #13392 · googleapis/google-cloud-java

jinseopkim0 · 2026-06-08T17:51:11Z

This PR migrates all remaining admin-related snippets and tests under java-bigtable/samples/snippets to utilize the modern BigtableTableAdminClientV2 and BigtableInstanceAdminClientV2, fully phasing out legacy V1 admin clients and .getBaseClient() references.

Migrated Samples & Tests:

Primary Admin Samples:
- HelloWorld.java & HelloWorldTest.java
- InstanceAdminExample.java & InstanceAdminExampleTest.java
- TableAdminExample.java & TableAdminExampleTest.java
Secondary Admin Samples:
- AuthorizedViewExample.java & AuthorizedViewExampleTest.java
- SchemaBundleExample.java & SchemaBundleExampleTest.java
- QuickstartTest.java
- MobileTimeSeriesBaseTest.java
- deletes/DeleteTableExample.java
- deletes/DeleteColumnFamilyExample.java
- deletes/DropRowRangeExample.java
- deletes/DeletesTest.java

Key Improvements:

Replaced all raw .getBaseClient() escape-hatch calls.
Replaced deprecated V1 .exists(...) and exists(tableId) calls with V2 getTable / getInstance try-catch blocks.
Updated nested models SubsetView and FamilySubsets to use the V2 protobuf-generated inner classes AuthorizedView.SubsetView and AuthorizedView.FamilySubsets.
Correctly constructed the ProtoSchema wrapper when building and parsing schema bundles in SchemaBundleExample.java.
Simplified column family presence checks by directly inspecting the keys of table.getColumnFamiliesMap(), completely eliminating legacy custom Truth correspondence helpers.

All files are formatted using spotify:fmt and compile cleanly (BUILD SUCCESS).

gemini-code-assist

Code Review

This pull request migrates Bigtable samples and tests to use the newer BigtableTableAdminClientV2 and BigtableInstanceAdminClientV2 clients along with direct protobuf-generated request and model classes. The review feedback identifies several important issues: potential resource leaks due to unclosed InputStream instances in SchemaBundleExample.java, an inverted assertion logic in InstanceAdminExampleTest.java that should use assertThrows to verify cluster deletion, and opportunities to optimize table existence checks across multiple files by requesting a NAME_ONLY view. Additionally, it is recommended to simplify column family checks in TableAdminExampleTest.java using containsKey.

gemini-code-assist · 2026-06-08T17:54:08Z

        InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH);
-        CreateSchemaBundleRequest request =
-            CreateSchemaBundleRequest.of(tableId, schemaBundleId)
-                .setProtoSchema(ByteString.readFrom(in));
-        SchemaBundle schemaBundle = adminClient.createSchemaBundle(request);
-        System.out.printf("Schema bundle: %s created successfully%n", schemaBundle.getId());
-      } catch (NotFoundException e) {
-        System.err.println(
-            "Failed to create a schema bundle from a non-existent table: " + e.getMessage());
-      } catch (IOException e) {
-        throw new RuntimeException(e);
+        com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
+            com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
+                .setProtoSchema(
+                    com.google.bigtable.admin.v2.ProtoSchema.newBuilder()
+                        .setProtoDescriptors(ByteString.readFrom(in))
+                        .build())
+                .build();


The InputStream opened from resources is never closed, which causes a resource leak. Wrap it in a try-with-resources block to ensure it is closed properly. Additionally, add a null check to handle cases where the resource is not found.

com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj; try (InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH)) { if (in == null) { throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH); } schemaBundleObj = com.google.bigtable.admin.v2.SchemaBundle.newBuilder() .setProtoSchema( com.google.bigtable.admin.v2.ProtoSchema.newBuilder() .setProtoDescriptors(ByteString.readFrom(in)) .build()) .build(); }

gemini-code-assist · 2026-06-08T17:54:09Z

      InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH);
-      UpdateSchemaBundleRequest request =
-          UpdateSchemaBundleRequest.of(tableId, schemaBundleId)
-              .setProtoSchema(ByteString.readFrom(in));
-      SchemaBundle schemaBundle = adminClient.updateSchemaBundle(request);
-      System.out.printf("Schema bundle: %s updated successfully%n", schemaBundle.getId());
-    } catch (NotFoundException e) {
-      System.err.println("Failed to modify a non-existent schema bundle: " + e.getMessage());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+      com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
+          com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
+              .setName(
+                  "projects/"
+                      + projectId
+                      + "/instances/"
+                      + instanceId
+                      + "/tables/"
+                      + tableId
+                      + "/schemaBundles/"
+                      + schemaBundleId)
+              .setProtoSchema(
+                  com.google.bigtable.admin.v2.ProtoSchema.newBuilder()
+                      .setProtoDescriptors(ByteString.readFrom(in))
+                      .build())
+              .build();


The InputStream opened from resources is never closed, which causes a resource leak. Wrap it in a try-with-resources block to ensure it is closed properly. Additionally, add a null check to handle cases where the resource is not found.

com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj; try (InputStream in = getClass().getClassLoader().getResourceAsStream(PROTO_FILE_PATH)) { if (in == null) { throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH); } schemaBundleObj = com.google.bigtable.admin.v2.SchemaBundle.newBuilder() .setName( "projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId + "/schemaBundles/" + schemaBundleId) .setProtoSchema( com.google.bigtable.admin.v2.ProtoSchema.newBuilder() .setProtoDescriptors(ByteString.readFrom(in)) .build()) .build(); }

gemini-code-assist · 2026-06-08T17:54:09Z

    instanceAdmin.deleteCluster();
-    adminClient.getCluster(instanceId, CLUSTER);
+    adminClient.getCluster(
+        "projects/" + projectId + "/instances/" + instanceId + "/clusters/" + CLUSTER);


Calling getCluster directly after deleteCluster will throw a NotFoundException if the deletion succeeds, which will cause the test to fail. If the deletion fails, it will return the cluster and the test will pass. This inverts the test logic. Use assertThrows to verify that the cluster was successfully deleted.

instanceAdmin.deleteCluster(); org.junit.Assert.assertThrows( NotFoundException.class, () -> adminClient.getCluster( "projects/" + projectId + "/instances/" + instanceId + "/clusters/" + CLUSTER));

gemini-code-assist · 2026-06-08T17:54:09Z

+  private boolean exists(String tableId) {
+    try {
+      adminClient.getTable(
+          com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
+              .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
+              .build());
+      return true;
+    } catch (com.google.api.gax.rpc.NotFoundException e) {
+      return false;
+    }
  }


When checking for table existence using getTable, retrieving the entire table schema can be inefficient and slow. You can optimize this by setting the view to NAME_ONLY on the GetTableRequest, which avoids retrieving unnecessary metadata like column families and GC rules.

Suggested change

private boolean exists(String tableId) {

try {

adminClient.getTable(

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.build());

return true;

} catch (com.google.api.gax.rpc.NotFoundException e) {

return false;

}

}

private boolean exists(String tableId) {

try {

adminClient.getTable(

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)

.build());

return true;

} catch (com.google.api.gax.rpc.NotFoundException e) {

return false;

}

}

gemini-code-assist · 2026-06-08T17:54:09Z

+    boolean exists = false;
+    try {
+      adminClient.getTable(
+          com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
+              .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
+              .build());
+      exists = true;
+    } catch (NotFoundException e) {
+      // ignore
+    }


When checking for table existence using getTable, retrieving the entire table schema can be inefficient and slow. You can optimize this by setting the view to NAME_ONLY on the GetTableRequest, which avoids retrieving unnecessary metadata like column families and GC rules.

boolean exists = false; try { adminClient.getTable( com.google.bigtable.admin.v2.GetTableRequest.newBuilder() .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId) .setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY) .build()); exists = true; } catch (NotFoundException e) { // ignore }

gemini-code-assist · 2026-06-08T17:54:09Z

+  private boolean exists(String tableId) {
+    try {
+      adminClient.getTable(
+          com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
+              .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
+              .build());
+      return true;
+    } catch (com.google.api.gax.rpc.NotFoundException e) {
+      return false;
+    }
  }


When checking for table existence using getTable, retrieving the entire table schema can be inefficient and slow. You can optimize this by setting the view to NAME_ONLY on the GetTableRequest, which avoids retrieving unnecessary metadata like column families and GC rules.

Suggested change

private boolean exists(String tableId) {

try {

adminClient.getTable(

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.build());

return true;

} catch (com.google.api.gax.rpc.NotFoundException e) {

return false;

}

}

private boolean exists(String tableId) {

try {

adminClient.getTable(

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)

.build());

return true;

} catch (com.google.api.gax.rpc.NotFoundException e) {

return false;

}

}

gemini-code-assist · 2026-06-08T17:54:09Z

+    boolean exists = false;
+    try {
+      adminClient.getTable(
+          com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
+              .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
+              .build());
+      exists = true;
+    } catch (NotFoundException e) {
+      // ignore
+    }


When checking for table existence using getTable, retrieving the entire table schema can be inefficient and slow. You can optimize this by setting the view to NAME_ONLY on the GetTableRequest, which avoids retrieving unnecessary metadata like column families and GC rules.

boolean exists = false; try { adminClient.getTable( com.google.bigtable.admin.v2.GetTableRequest.newBuilder() .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId) .setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY) .build()); exists = true; } catch (NotFoundException e) { // ignore }

gemini-code-assist · 2026-06-08T17:54:09Z

    boolean found = true;
-    List<ColumnFamily> columnFamilies = adminClient.getTable(tableId).getColumnFamilies();
-    for (ColumnFamily columnFamily : columnFamilies) {
-      if (columnFamily.equals("cf2")) {
+    com.google.bigtable.admin.v2.GetTableRequest request =
+        com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
+            .setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
+            .build();
+    for (String familyName : adminClient.getTable(request).getColumnFamiliesMap().keySet()) {
+      if (familyName.equals("cf2")) {
        found = false;
        break;
      }


Instead of looping through the key set of column families to check if cf2 is deleted, you can use containsKey directly on the map. This is cleaner, more readable, and more efficient.

Suggested change

boolean found = true;

List<ColumnFamily> columnFamilies = adminClient.getTable(tableId).getColumnFamilies();

for (ColumnFamily columnFamily : columnFamilies) {

if (columnFamily.equals("cf2")) {

com.google.bigtable.admin.v2.GetTableRequest request =

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.build();

for (String familyName : adminClient.getTable(request).getColumnFamiliesMap().keySet()) {

if (familyName.equals("cf2")) {

found = false;

break;

}

com.google.bigtable.admin.v2.GetTableRequest request =

com.google.bigtable.admin.v2.GetTableRequest.newBuilder()

.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)

.build();

boolean found = !adminClient.getTable(request).getColumnFamiliesMap().containsKey("cf2");

jinseopkim0 added 2 commits June 8, 2026 13:23

samples(bigtable): migrate admin snippets to modern V2 clients

527541a

samples(bigtable): migrate secondary admin samples to V2 clients

678aae4

gemini-code-assist Bot reviewed Jun 8, 2026

View reviewed changes

chore(bigtable-samples): address gemini-code-assist review feedback

922dd1d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

samples(bigtable): migrate all admin snippets and tests to modern V2 clients#13392

samples(bigtable): migrate all admin snippets and tests to modern V2 clients#13392
jinseopkim0 wants to merge 3 commits into
mainfrom
bigtable-v2-samples

jinseopkim0 commented Jun 8, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

jinseopkim0 commented Jun 8, 2026

Migrated Samples & Tests:

Key Improvements:

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant