diff options
author | Eric Anderson <ejona@google.com> | 2018-07-02 10:47:40 -0700 |
---|---|---|
committer | Eric Anderson <ejona@google.com> | 2018-07-09 13:00:17 -0700 |
commit | 9d6241eedce849493b86320a995fd27775f0bd40 (patch) | |
tree | de2db959ee7d141e6f330a6f210a1bef6f6d969c /netty | |
parent | 2b48210b73879767f4895c67d8c4e7787618b610 (diff) | |
download | grpc-grpc-java-9d6241eedce849493b86320a995fd27775f0bd40.tar.gz |
Propagate EquivalentAddressGroup attributes to transports
Most of the changes are changing the signature of newClientTransport.
Since this is annoying, I choose to introduce a ClientTransportOptions
object to avoid the churn in the future.
With ClientTransportOptions in place, there's only a few lines necessary
of plumbing for the Attributes: add the field to ClientTransportOptions
and populate it in InternalSubchannel. There are no consumers of the
field in this commit.
Diffstat (limited to 'netty')
-rw-r--r-- | netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java | 9 | ||||
-rw-r--r-- | netty/src/test/java/io/grpc/netty/NettyTransportTest.java | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java index 9b85f0b9c..3ff59ab15 100644 --- a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java +++ b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java @@ -508,12 +508,15 @@ public final class NettyChannelBuilder @Override public ConnectionClientTransport newClientTransport( - SocketAddress serverAddress, String authority, @Nullable String userAgent, - @Nullable ProxyParameters proxy) { + SocketAddress serverAddress, ClientTransportOptions options) { checkState(!closed, "The transport factory is closed."); TransportCreationParamsFilter dparams = - transportCreationParamsFilterFactory.create(serverAddress, authority, userAgent, proxy); + transportCreationParamsFilterFactory.create( + serverAddress, + options.getAuthority(), + options.getUserAgent(), + options.getProxyParameters()); final AtomicBackoff.State keepAliveTimeNanosState = keepAliveTimeNanos.getState(); Runnable tooManyPingsRunnable = new Runnable() { diff --git a/netty/src/test/java/io/grpc/netty/NettyTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyTransportTest.java index 3fb2233f9..cb5dee943 100644 --- a/netty/src/test/java/io/grpc/netty/NettyTransportTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyTransportTest.java @@ -96,9 +96,8 @@ public class NettyTransportTest extends AbstractTransportTest { int port = server.getPort(); return clientFactory.newClientTransport( new InetSocketAddress("localhost", port), - testAuthority(server), - null /* agent */, - null /* proxy */); + new ClientTransportFactory.ClientTransportOptions() + .setAuthority(testAuthority(server))); } @Test |