Fixes.

Author: kannanjgithub

netty/src/main/java/io/grpc/netty/NettyClientTransport.java

@@ -112,7 +112,8 @@ class NettyClientTransport implements ConnectionClientTransport {
   private final ChannelLogger channelLogger;
   private final boolean useGetForSafeMethods;
   private final Ticker ticker;
-  private final ConcurrentHashMap<String, Boolean> authoritiesAllowedForPeer = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, Boolean> authoritiesAllowedForPeer =
+      new ConcurrentHashMap<>();
 
   NettyClientTransport(
       SocketAddress address,

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -45,7 +45,6 @@
 import io.grpc.internal.GrpcAttributes;
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.ObjectPool;
-import io.grpc.util.CertificateUtils;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandler;
@@ -69,8 +68,6 @@
 import io.netty.handler.ssl.SslProvider;
 import io.netty.util.AsciiString;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -100,7 +97,6 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509ExtendedTrustManager;
-import javax.security.auth.x500.X500Principal;
 
 /**
  * Common {@link ProtocolNegotiator}s used by gRPC.

netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java

@@ -1288,7 +1288,7 @@ public void transportReady() {
     public void transportInUse(boolean inUse) {}
   }
 
-  private class FakeTrustManager implements X509TrustManager {
+  private static class FakeTrustManager implements X509TrustManager {
 
     private final X509TrustManager delegate;