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 /cronet | |
| 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 'cronet')
| -rw-r--r-- | cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java | 8 | ||||
| -rw-r--r-- | cronet/src/test/java/io/grpc/cronet/CronetChannelBuilderTest.java | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java b/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java index 58b40c7c2..581138725 100644 --- a/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java +++ b/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java @@ -228,11 +228,11 @@ public final class CronetChannelBuilder extends } @Override - public ConnectionClientTransport newClientTransport(SocketAddress addr, String authority, - @Nullable String userAgent, @Nullable ProxyParameters proxy) { + public ConnectionClientTransport newClientTransport( + SocketAddress addr, ClientTransportOptions options) { InetSocketAddress inetSocketAddr = (InetSocketAddress) addr; - return new CronetClientTransport(streamFactory, inetSocketAddr, authority, userAgent, - executor, maxMessageSize, alwaysUsePut, transportTracer); + return new CronetClientTransport(streamFactory, inetSocketAddr, options.getAuthority(), + options.getUserAgent(), executor, maxMessageSize, alwaysUsePut, transportTracer); } @Override diff --git a/cronet/src/test/java/io/grpc/cronet/CronetChannelBuilderTest.java b/cronet/src/test/java/io/grpc/cronet/CronetChannelBuilderTest.java index 7f1d55cd1..28ac2497d 100644 --- a/cronet/src/test/java/io/grpc/cronet/CronetChannelBuilderTest.java +++ b/cronet/src/test/java/io/grpc/cronet/CronetChannelBuilderTest.java @@ -27,6 +27,7 @@ import io.grpc.Metadata; import io.grpc.MethodDescriptor; import io.grpc.cronet.CronetChannelBuilder.CronetTransportFactory; import io.grpc.internal.ClientTransportFactory; +import io.grpc.internal.ClientTransportFactory.ClientTransportOptions; import io.grpc.internal.SharedResourceHolder; import io.grpc.testing.TestMethodDescriptors; import java.net.InetSocketAddress; @@ -60,7 +61,7 @@ public final class CronetChannelBuilderTest { CronetClientTransport transport = (CronetClientTransport) transportFactory.newClientTransport( - new InetSocketAddress("localhost", 443), "", null, null); + new InetSocketAddress("localhost", 443), new ClientTransportOptions()); CronetClientStream stream = transport.newStream(method, new Metadata(), CallOptions.DEFAULT); assertTrue(stream.idempotent); @@ -74,7 +75,7 @@ public final class CronetChannelBuilderTest { CronetClientTransport transport = (CronetClientTransport) transportFactory.newClientTransport( - new InetSocketAddress("localhost", 443), "", null, null); + new InetSocketAddress("localhost", 443), new ClientTransportOptions()); CronetClientStream stream = transport.newStream(method, new Metadata(), CallOptions.DEFAULT); assertFalse(stream.idempotent); |