fixes

Change-Id: Ibaa32ee3425b23596a3141bb4e29cfb068caf0ee

Author: nicholsl

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

@@ -15,9 +15,11 @@
  */
 package com.google.cloud.bigtable.data.v2.stub;
 
+import com.google.api.core.InternalApi;
 import com.google.api.gax.grpc.ChannelPrimer;
 import io.grpc.ManagedChannel;
 
+@InternalApi
 public class NoOpChannelPrimer implements ChannelPrimer {
   static NoOpChannelPrimer create() {
     return new NoOpChannelPrimer();

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

@@ -101,9 +101,7 @@ public static BigtableChannelPool create(
 
     for (int i = 0; i < settings.getInitialChannelCount(); i++) {
       ManagedChannel newChannel = channelFactory.createSingleChannel();
-      if (channelPrimer != null) {
-        channelPrimer.primeChannel(newChannel);
-      }
+      channelPrimer.primeChannel(newChannel);
       initialListBuilder.add(new Entry(newChannel));
     }
 
@@ -329,9 +327,7 @@ private void expand(int desiredSize) {
     for (int i = 0; i < desiredSize - localEntries.size(); i++) {
       try {
         ManagedChannel newChannel = channelFactory.createSingleChannel();
-        if (this.channelPrimer != null) {
-          this.channelPrimer.primeChannel(newChannel);
-        }
+        this.channelPrimer.primeChannel(newChannel);
         newEntries.add(new Entry(newChannel));
       } catch (IOException e) {
         LOG.log(Level.WARNING, "Failed to add channel", e);
@@ -371,9 +367,7 @@ void refresh() {
       for (int i = 0; i < newEntries.size(); i++) {
         try {
           ManagedChannel newChannel = channelFactory.createSingleChannel();
-          if (this.channelPrimer != null) {
-            this.channelPrimer.primeChannel(newChannel);
-          }
+          this.channelPrimer.primeChannel(newChannel);
           newEntries.set(i, new Entry(newChannel));
         } catch (IOException e) {
           LOG.log(Level.WARNING, "Failed to refresh channel, leaving old channel", e);