fixes

Change-Id: Ib414d250f9f1ce0555450e81a706f6c0619d80f2

Author: nicholsl

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableChannelPrimer.java

@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.data.v2.stub;
 
-import com.google.api.core.BetaApi;
+import com.google.api.core.InternalApi;
 import com.google.api.core.SettableApiFuture;
 import com.google.api.gax.grpc.ChannelPrimer;
 import com.google.auth.Credentials;
@@ -46,7 +46,7 @@
  * <p>This implementation is subject to change in the future, but currently it will prime the
  * channel by sending a ReadRow request for a hardcoded, non-existent row key.
  */
-@BetaApi("Channel priming is not currently stable and might change in the future")
+@InternalApi("Channel priming is not currently stable and might change in the future")
 public class BigtableChannelPrimer implements ChannelPrimer {
   private static Logger LOG = Logger.getLogger(BigtableChannelPrimer.class.toString());
 

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java

@@ -121,26 +121,23 @@ public static BigtableClientContext create(EnhancedBigtableStubSettings settings
         setupCookieHolder(transportProvider);
       }
 
-      BigtableChannelPrimer channelPrimer =
-          BigtableChannelPrimer.create(
-              builder.getProjectId(),
-              builder.getInstanceId(),
-              builder.getAppProfileId(),
-              credentials,
-              builder.getHeaderProvider().getHeaders());
-      
-      BigtableTransportChannelProvider btTransportProvider;
+      BigtableChannelPrimer channelPrimer;
 
       // Inject channel priming if enabled
       if (builder.isRefreshingChannel()) {
-        btTransportProvider =
-            BigtableTransportChannelProvider.create(
-                (InstantiatingGrpcChannelProvider) transportProvider.build(), channelPrimer);
+        channelPrimer =
+            BigtableChannelPrimer.create(
+                builder.getProjectId(),
+                builder.getInstanceId(),
+                builder.getAppProfileId(),
+                credentials,
+                builder.getHeaderProvider().getHeaders());
       } else {
-        btTransportProvider =
-            BigtableTransportChannelProvider.createWithoutChannelPriming(
-                (InstantiatingGrpcChannelProvider) transportProvider.build());
+        channelPrimer = null;
       }
+      BigtableTransportChannelProvider btTransportProvider =
+          BigtableTransportChannelProvider.create(
+              (InstantiatingGrpcChannelProvider) transportProvider.build(), channelPrimer);
 
       builder.setTransportChannelProvider(btTransportProvider);
     }

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/BigtableTransportChannelProvider.java

@@ -162,12 +162,6 @@ public TransportChannelProvider withCredentials(Credentials credentials) {
   public static BigtableTransportChannelProvider create(
       InstantiatingGrpcChannelProvider instantiatingGrpcChannelProvider,
       BigtableChannelPrimer channelPrimer) {
-    Preconditions.checkNotNull(channelPrimer);
     return new BigtableTransportChannelProvider(instantiatingGrpcChannelProvider, channelPrimer);
   }
-
-  public static BigtableTransportChannelProvider createWithoutChannelPriming(
-      InstantiatingGrpcChannelProvider instantiatingGrpcChannelProvider) {
-    return new BigtableTransportChannelProvider(instantiatingGrpcChannelProvider, null);
-  }
 }