files renamed and other edits

Author: elisheva-qlogic

…/cloud/examples/bigtable/TableAdmin.java …examples/bigtable/TableAdminExample.javagoogle-cloud-examples/src/main/java/com/google/cloud/examples/bigtable/TableAdmin.java renamed to google-cloud-examples/src/main/java/com/google/cloud/examples/bigtable/TableAdminExample.java google-cloud-examples/src/main/java/com/google/cloud/examples/bigtable/TableAdmin.java renamed to google-cloud-examples/src/main/java/com/google/cloud/examples/bigtable/TableAdminExample.java

@@ -35,23 +35,23 @@
  * <p>This example demonstrates the usage of BigtableTableAdminClient to create, configure and
  * delete a Cloud Bigtable table.
  *
- * <pre>
- *   creates table
- *   lists all tables
- *   gets table metadata
- *   creates DurationRule
- *   creates VersionRule
- *   creates UnionRule
- *   creates IntersectionRule
- *   creates nested rule
- *   lists column families
- *   modifies column family rule
- *   prints modified column family
- *   deletes column family
- *   deletes table
- * </pre>
+ * <ul>
+ *   <li>creates table
+ *   <li>lists all tables
+ *   <li>gets table metadata
+ *   <li>creates DurationRule
+ *   <li>creates VersionRule
+ *   <li>creates UnionRule
+ *   <li>creates IntersectionRule
+ *   <li>creates nested rule
+ *   <li>lists column families
+ *   <li>modifies column family rule
+ *   <li>prints modified column family
+ *   <li>deletes column family
+ *   <li>deletes table
+ * </ul>
  */
-public class TableAdmin {
+public class TableAdminExample {
 
   private static final String COLUMN_FAMILY_1 = "cf1";
   private static final String COLUMN_FAMILY_2 = "cf2";
@@ -70,18 +70,19 @@ public static void main(String[] args) throws IOException {
     String projectId = args[0];
     String instanceId = args[1];
 
-    TableAdmin tableAdmin = new TableAdmin(projectId, instanceId, "test-table");
+    TableAdminExample tableAdmin = new TableAdminExample(projectId, instanceId, "test-table");
     tableAdmin.run();
   }
 
-  public TableAdmin(String projectId, String instanceId, String tableId) throws IOException {
+  public TableAdminExample(String projectId, String instanceId, String tableId) throws IOException {
     this.tableId = tableId;
 
     // [START connecting_to_bigtable]
     // Creates the settings to configure a bigtable table admin client.
     BigtableTableAdminSettings adminSettings =
         BigtableTableAdminSettings.newBuilder()
-            .setInstanceName(com.google.bigtable.admin.v2.InstanceName.of(projectId, instanceId))
+            .setProjectId(projectId)
+            .setInstanceId(instanceId)
             .build();
 
     // Creates a bigtable table admin client.
@@ -358,7 +359,6 @@ public void deleteTable() {
     try {
       adminClient.deleteTable(tableId);
       System.out.printf("Table: %s deleted successfully%n", tableId);
-
     } catch (NotFoundException e) {
       System.err.println("Failed to delete a non-existent table: " + e.getMessage());
     }
@@ -367,7 +367,7 @@ public void deleteTable() {
 
   private static void printColumnFamily(ColumnFamily columnFamily) {
     System.out.printf(
-        "Column family: %s%nMetadata: %s%n",
+        "Column family: %s%nGC Rule: %s%n",
         columnFamily.getId(), columnFamily.getGCRule().toString());
   }
 }

…loud/examples/bigtable/ITTableAdmin.java …amples/bigtable/ITTableAdminExample.javagoogle-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITTableAdmin.java renamed to google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITTableAdminExample.java google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITTableAdmin.java renamed to google-cloud-examples/src/test/java/com/google/cloud/examples/bigtable/ITTableAdminExample.java

@@ -15,6 +15,7 @@
  */
 package com.google.cloud.examples.bigtable;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import com.google.bigtable.admin.v2.InstanceName;
@@ -36,15 +37,16 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/** Integration tests for {@link TableAdmin} */
-public class ITTableAdmin {
+/** Integration tests for {@link TableAdminExample} */
+public class ITTableAdminExample {
 
   private static final String INSTANCE_PROPERTY_NAME = "bigtable.instance";
   private static final String TABLE_PREFIX = "table";
-  private static String tableId;
   private static BigtableTableAdminClient adminClient;
-  private static InstanceName instanceName;
-  private TableAdmin tableAdmin;
+  private static String instanceName;
+  private static String projectName;
+  private String tableId;
+  private TableAdminExample tableAdmin;
 
   @BeforeClass
   public static void beforeClass() throws IOException {
@@ -53,9 +55,13 @@ public static void beforeClass() throws IOException {
       adminClient = null;
       return;
     }
-    instanceName = InstanceName.parse(targetInstance);
+    instanceName = InstanceName.parse(targetInstance).getInstance();
+    projectName = InstanceName.parse(targetInstance).getProject();
     BigtableTableAdminSettings adminSettings =
-        BigtableTableAdminSettings.newBuilder().setInstanceName(instanceName).build();
+        BigtableTableAdminSettings.newBuilder()
+            .setInstanceId(instanceName)
+            .setProjectId(projectName)
+            .build();
     adminClient = BigtableTableAdminClient.create(adminSettings);
   }
 
@@ -72,7 +78,7 @@ public void setup() throws IOException {
           INSTANCE_PROPERTY_NAME + " property is not set, skipping integration tests.");
     }
     tableId = generateTableId();
-    tableAdmin = new TableAdmin(instanceName.getProject(), instanceName.getInstance(), tableId);
+    tableAdmin = new TableAdminExample(projectName, instanceName, tableId);
     adminClient.createTable(CreateTableRequest.of(tableId).addFamily("cf"));
   }
 
@@ -86,15 +92,14 @@ public void after() {
   @Test
   public void testCreateAndDeleteTable() throws IOException {
     // Creates a table.
-    String fakeTable = generateTableId();
-    TableAdmin testTableAdmin =
-        new TableAdmin(instanceName.getProject(), instanceName.getInstance(), fakeTable);
+    String testTable = generateTableId();
+    TableAdminExample testTableAdmin = new TableAdminExample(projectName, instanceName, testTable);
     testTableAdmin.createTable();
-    assertTrue(adminClient.exists(fakeTable));
+    assertTrue(adminClient.exists(testTable));
 
     // Deletes a table.
     testTableAdmin.deleteTable();
-    assertTrue(!adminClient.exists(fakeTable));
+    assertFalse(adminClient.exists(testTable));
   }
 
   @Test
@@ -178,7 +183,7 @@ public void testRunDoesNotFail() {
 
   // TODO: add test for tableAdmin.listAllTables()
   // TODO: add test for tableAdmin.getTableMeta()
-  // TODO: add test for tableAdmin.listColumnFamilies
+  // TODO: add test for tableAdmin.listColumnFamilies()
 
   private boolean ruleCheck(Object condition) {
     boolean found = false;