improve view name formating

Change-Id: I85e271194cfada199186db271b042eeedf9fd7cf

Author: igorbernstein2

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/NameUtil.java

@@ -50,7 +50,7 @@ public static String formatTableName(
 
   public static String formatTableName(
       @Nonnull String projectId, @Nonnull String instanceId, @Nonnull TableId tableId) {
-    return formatInstanceName(projectId, instanceId) + "/tables/" + tableId.getTableId();
+    return formatTableName(projectId, instanceId, tableId.getTableId());
   }
 
   public static String formatAuthorizedViewName(
@@ -64,16 +64,26 @@ public static String formatAuthorizedViewName(
   public static String formatAuthorizedViewName(
       @Nonnull String projectId,
       @Nonnull String instanceId,
-      @Nonnull TableId tableId,
-      @Nonnull String authorizedViewId) {
-    return formatTableName(projectId, instanceId, tableId) + "/authorizedViews/" + authorizedViewId;
+      @Nonnull AuthorizedViewId authorizedViewId) {
+    return formatTableName(projectId, instanceId, authorizedViewId.getTableId())
+        + "/authorizedViews/"
+        + authorizedViewId.getAuthorizedViewId();
   }
 
   public static String formatMaterializedViewName(
       @Nonnull String projectId, @Nonnull String instanceId, @Nonnull String materializedViewId) {
     return formatInstanceName(projectId, instanceId) + "/materializedViews/" + materializedViewId;
   }
 
+  public static String formatMaterializedViewName(
+      @Nonnull String projectId,
+      @Nonnull String instanceId,
+      @Nonnull MaterializedViewId materializedViewId) {
+    return formatInstanceName(projectId, instanceId)
+        + "/materializedViews/"
+        + materializedViewId.getMaterializedViewId();
+  }
+
   public static String extractTableIdFromTableName(@Nonnull String fullTableName) {
     Matcher matcher = TABLE_PATTERN.matcher(fullTableName);
     if (!matcher.matches()) {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/AuthorizedViewId.java

@@ -42,9 +42,9 @@ public static AuthorizedViewId of(TableId tableId, String authorizedViewId) {
     return new AutoValue_AuthorizedViewId(tableId.getTableId(), authorizedViewId);
   }
 
-  abstract String getTableId();
+  public abstract String getTableId();
 
-  abstract String getAuthorizedViewId();
+  public abstract String getAuthorizedViewId();
 
   @Override
   @InternalApi

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MaterializedViewId.java

@@ -35,7 +35,7 @@ public static MaterializedViewId of(String materializedViewId) {
     return new AutoValue_MaterializedViewId(materializedViewId);
   }
 
-  abstract String getMaterializedViewId();
+  public abstract String getMaterializedViewId();
 
   @Override
   @InternalApi

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/BuiltinMetricsTracerTest.java

@@ -21,6 +21,7 @@
 import static com.google.cloud.bigtable.data.v2.stub.metrics.BuiltinMetricsTestUtils.verifyAttributes;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assert.assertThrows;
 
 import com.google.api.client.util.Lists;
 import com.google.api.core.ApiFunction;
@@ -119,7 +120,6 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -367,6 +367,7 @@ public void onResponse(Row response) {
                 try {
                   Thread.sleep(100);
                 } catch (InterruptedException ignored) {
+                  // dont really care
                 }
               }
 
@@ -455,10 +456,11 @@ public void onStart(StreamController streamController) {}
 
               @Override
               public void onResponse(Row row) {
+                counter.getAndIncrement();
                 try {
-                  counter.getAndIncrement();
                   Thread.sleep(APPLICATION_LATENCY);
                 } catch (InterruptedException ignored) {
+                  // dont really care
                 }
               }
 
@@ -603,7 +605,7 @@ public void testMutateRowsPartialError() throws InterruptedException {
       batcher.add(RowMutationEntry.create(key).setCell("f", "q", "v"));
     }
 
-    Assert.assertThrows(BatchingException.class, batcher::close);
+    assertThrows(BatchingException.class, batcher::close);
 
     MetricData metricData = getMetricData(metricReader, TableAttemptLatency.NAME);
 
@@ -631,7 +633,7 @@ public void testMutateRowsRpcError() {
       batcher.add(RowMutationEntry.create(key).setCell("f", "q", "v"));
     }
 
-    Assert.assertThrows(BatchingException.class, batcher::close);
+    assertThrows(BatchingException.class, batcher::close);
 
     MetricData metricData = getMetricData(metricReader, TableAttemptLatency.NAME);
 
@@ -767,12 +769,11 @@ public void testQueuedOnChannelUnaryLatencies() throws Exception {
 
   @Test
   public void testPermanentFailure() {
-    try {
-      Lists.newArrayList(
-          stub.readRowsCallable().call(Query.create(TableId.of(BAD_TABLE_ID))).iterator());
-      Assert.fail("Request should throw not found error");
-    } catch (NotFoundException ignored) {
-    }
+    assertThrows(
+        NotFoundException.class,
+        () ->
+            Lists.newArrayList(
+                stub.readRowsCallable().call(Query.create(TableId.of(BAD_TABLE_ID))).iterator()));
 
     MetricData attemptLatency = getMetricData(metricReader, TableAttemptLatency.NAME);
 
@@ -1054,6 +1055,7 @@ public void readRows(
       try {
         Thread.sleep(SERVER_LATENCY);
       } catch (InterruptedException ignored) {
+        // dont care
       }
       if (attemptCounter.getAndIncrement() == 0) {
         target.onError(new StatusRuntimeException(Status.UNAVAILABLE));
@@ -1096,6 +1098,7 @@ public void mutateRows(
       try {
         Thread.sleep(SERVER_LATENCY);
       } catch (InterruptedException ignored) {
+        // dont care
       }
       MutateRowsResponse.Builder builder = MutateRowsResponse.newBuilder();
       String receivedRowkey = "";
@@ -1208,7 +1211,7 @@ public ProxiedSocketAddress proxyFor(SocketAddress socketAddress) throws IOExcep
       try {
         Thread.sleep(CHANNEL_BLOCKING_LATENCY.toMillis());
       } catch (InterruptedException ignored) {
-
+        // dont care
       }
       return null;
     }