fix minor issues

gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

@@ -41,6 +41,7 @@
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.ComputeEngineCredentials;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -519,10 +520,10 @@ public int getPoolSize() {
      */
     public Builder setPoolSize(int poolSize) {
       Preconditions.checkArgument(poolSize > 0, "Pool size must be positive");
-      if (poolSize > MAX_POOL_SIZE) {
-        poolSize = MAX_POOL_SIZE;
-      }
       this.poolSize = poolSize;
+      if (this.poolSize > MAX_POOL_SIZE) {
+        this.poolSize = MAX_POOL_SIZE;
+      }
       return this;
     }
 

gax-grpc/src/test/java/com/google/api/gax/grpc/ChannelPoolTest.java

@@ -40,6 +40,7 @@
 import io.grpc.ManagedChannel;
 import io.grpc.MethodDescriptor;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -63,20 +64,19 @@ public void testAuthority() throws IOException {
 
     Mockito.when(sub1.authority()).thenReturn("myAuth");
 
-    ChannelPool pool =
-        new ChannelPool(2, new FakeChannelFactory(Lists.newArrayList(sub1, sub2)), null);
+    ChannelPool pool = new ChannelPool(2, new FakeChannelFactory(Arrays.asList(sub1, sub2)), null);
     Truth.assertThat(pool.authority()).isEqualTo("myAuth");
   }
 
   @Test
   public void testRoundRobin() throws IOException {
     ManagedChannel sub1 = Mockito.mock(ManagedChannel.class);
     ManagedChannel sub2 = Mockito.mock(ManagedChannel.class);
-    final List<ManagedChannel> channels = Lists.newArrayList(sub1, sub2);
 
     Mockito.when(sub1.authority()).thenReturn("myAuth");
 
-    ChannelPool pool = new ChannelPool(2, new FakeChannelFactory(channels), null);
+    ArrayList<ManagedChannel> channels = Lists.newArrayList(sub1, sub2);
+    ChannelPool pool = new ChannelPool(2, new FakeChannelFactory(Arrays.asList(sub1, sub2)), null);
 
     verifyTargetChannel(pool, channels, sub1);
     verifyTargetChannel(pool, channels, sub2);