From acdcd5b1142f5d4785c74a1ee4ad09687320cc2f Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Tue, 16 Feb 2016 09:57:38 -0800
Subject: [PATCH] Raise visibility of netty Channel Builder, and provide a way
 to pass in a custom protocol negotiator per transport

---
 .../main/java/io/grpc/netty/NettyChannelBuilder.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
index 9420c096d3..3a0905899c 100644
--- a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
+++ b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java
@@ -267,7 +267,11 @@ public class NettyChannelBuilder extends AbstractManagedChannelImplBuilder<Netty
     }
   }
 
-  private static class NettyTransportFactory extends AbstractReferenceCounted
+  /**
+   * Creates Netty transports.  Exposed for internal use, as it should be private.
+   */
+  @Internal
+  protected static final class NettyTransportFactory extends AbstractReferenceCounted
           implements ClientTransportFactory {
     private final Class<? extends Channel> channelType;
     private final NegotiationType negotiationType;
@@ -308,6 +312,12 @@ public class NettyChannelBuilder extends AbstractManagedChannelImplBuilder<Netty
         SocketAddress serverAddress, String authority) {
       ProtocolNegotiator negotiator = protocolNegotiator != null ? protocolNegotiator :
           createProtocolNegotiator(authority, negotiationType, sslContext);
+      return newClientTransport(serverAddress, authority, negotiator);
+    }
+
+    @Internal  // This is strictly for internal use.  Depend on this at your own peril.
+    protected ManagedClientTransport newClientTransport(SocketAddress serverAddress,
+        String authority, ProtocolNegotiator negotiator) {
       return new NettyClientTransport(serverAddress, channelType, group, negotiator,
           flowControlWindow, maxMessageSize, maxHeaderListSize, authority);
     }