diff options
author | ZHANG Dapeng <zdapeng@google.com> | 2017-07-25 14:12:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-25 14:12:36 -0700 |
commit | 883a85ee93eef41b9ff1b61496dabe561bbaa870 (patch) | |
tree | 59828e3f6df057e51d6ad945a24562cb14bc57d7 /netty | |
parent | 0fb0fda3e1c2ce4ae9a41ecb3ca3f08a43922cd8 (diff) | |
download | grpc-grpc-java-883a85ee93eef41b9ff1b61496dabe561bbaa870.tar.gz |
core,netty,okhttp: remove 2-arg ClientTransport.newStream()
to keep only one `newStream()` method in the `ClientTransport` interface
Diffstat (limited to 'netty')
-rw-r--r-- | netty/src/main/java/io/grpc/netty/NettyClientTransport.java | 5 | ||||
-rw-r--r-- | netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java index b251a575b..c15b4a9c0 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java @@ -154,11 +154,6 @@ class NettyClientTransport implements ConnectionClientTransport { statsTraceCtx); } - @Override - public ClientStream newStream(MethodDescriptor<?, ?> method, Metadata headers) { - return newStream(method, headers, CallOptions.DEFAULT); - } - @SuppressWarnings("unchecked") @Override public Runnable start(Listener transportListener) { diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java index 881ea56fc..b8efaa87f 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java @@ -36,6 +36,7 @@ import static org.junit.Assert.fail; import com.google.common.io.ByteStreams; import com.google.common.util.concurrent.SettableFuture; import io.grpc.Attributes; +import io.grpc.CallOptions; import io.grpc.Context; import io.grpc.Grpc; import io.grpc.Metadata; @@ -511,7 +512,7 @@ public class NettyClientTransportTest { } Rpc(NettyClientTransport transport, Metadata headers) { - stream = transport.newStream(METHOD, headers); + stream = transport.newStream(METHOD, headers, CallOptions.DEFAULT); stream.start(listener); stream.request(1); stream.writeMessage(new ByteArrayInputStream(MESSAGE.getBytes(UTF_8))); |