From d2929cd1a359ccbc6b87aa2cc2763f572964bda1 Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Tue, 4 Aug 2015 16:32:32 -0700 Subject: [PATCH] Reorganize packages. Reserve io.grpc for public API only, and all internal stuff in core to io.grpc.internal, including the non-stable transport API. Raise the netty/okhttp/inprocess subpackages one level up to io.grpc, because they are public API and entry points for most users. Details: - Rename io.grpc.transport to io.grpc.internal; - Move SharedResourceHolder and SerializingExecutor to io.grpc.internal - Rename io.grpc.transport.{netty|okhttp|inprocess} to io.grpc.{netty|okhttp|inprocess} --- .../integrationtest/InteropTester.java | 2 +- .../grpc/benchmarks/TransportBenchmark.java | 14 ++-- .../benchmarks/netty/AbstractBenchmark.java | 6 +- .../io/grpc/benchmarks/qps/AsyncServer.java | 5 +- .../benchmarks/qps/ClientConfiguration.java | 2 +- .../benchmarks/qps/ServerConfiguration.java | 2 +- .../java/io/grpc/benchmarks/qps/Utils.java | 13 ++-- .../java/io/grpc/AbstractChannelBuilder.java | 5 +- .../java/io/grpc/AbstractServerBuilder.java | 6 +- core/src/main/java/io/grpc/ChannelImpl.java | 14 ++-- .../src/main/java/io/grpc/ClientCallImpl.java | 9 +-- core/src/main/java/io/grpc/Context.java | 3 +- core/src/main/java/io/grpc/ServerImpl.java | 16 +++-- .../inprocess/InProcessChannelBuilder.java | 6 +- .../inprocess/InProcessServer.java | 8 +-- .../inprocess/InProcessServerBuilder.java | 2 +- .../inprocess/InProcessTransport.java | 16 ++--- .../AbstractClientStream.java | 2 +- .../AbstractReadableBuffer.java | 2 +- .../AbstractServerStream.java | 2 +- .../AbstractStream.java | 2 +- .../{transport => internal}/ClientStream.java | 2 +- .../ClientStreamListener.java | 2 +- .../ClientTransport.java | 2 +- .../ClientTransportFactory.java | 2 +- .../CompositeReadableBuffer.java | 2 +- .../ForwardingReadableBuffer.java | 2 +- .../Http2ClientStream.java | 2 +- .../{transport => internal}/Http2Ping.java | 4 +- .../{transport => internal}/HttpUtil.java | 2 +- .../MessageDeframer.java | 2 +- .../MessageFramer.java | 2 +- .../ReadableBuffer.java | 2 +- .../ReadableBuffers.java | 2 +- .../{ => internal}/SerializingExecutor.java | 2 +- .../grpc/{transport => internal}/Server.java | 2 +- .../ServerListener.java | 2 +- .../{transport => internal}/ServerStream.java | 2 +- .../ServerStreamListener.java | 2 +- .../ServerTransport.java | 2 +- .../ServerTransportListener.java | 2 +- .../{ => internal}/SharedResourceHolder.java | 2 +- .../grpc/{transport => internal}/Stream.java | 2 +- .../StreamListener.java | 2 +- .../TransportFrameUtil.java | 2 +- .../WritableBuffer.java | 2 +- .../WritableBufferAllocator.java | 2 +- .../test/java/io/grpc/ChannelImplTest.java | 8 +-- .../src/test/java/io/grpc/ServerImplTest.java | 12 ++-- .../AbstractReadableBufferTest.java | 2 +- .../AbstractStreamTest.java | 4 +- .../ByteWritableBufferTest.java | 2 +- .../CompositeReadableBufferTest.java | 2 +- .../{transport => internal}/HttpUtilTest.java | 4 +- .../MessageDeframerTest.java | 4 +- .../MessageFramerTest.java | 4 +- .../ReadableBufferTestBase.java | 2 +- .../ReadableBuffersArrayTest.java | 4 +- .../ReadableBuffersByteBufferTest.java | 2 +- .../SharedResourceHolderTest.java | 4 +- .../TransportFrameUtilTest.java | 2 +- .../WritableBufferAllocatorTestBase.java | 2 +- .../WritableBufferTestBase.java | 2 +- .../examples/header/CustomHeaderClient.java | 4 +- .../examples/header/CustomHeaderServer.java | 2 +- .../examples/helloworld/HelloWorldClient.java | 4 +- .../examples/helloworld/HelloWorldServer.java | 2 +- .../examples/routeguide/RouteGuideClient.java | 4 +- .../examples/routeguide/RouteGuideServer.java | 2 +- .../integration/TestServiceClient.java | 8 +-- .../integration/TestServiceServer.java | 4 +- .../Http2NettyLocalChannelTest.java | 6 +- .../testing/integration/Http2NettyTest.java | 6 +- .../testing/integration/Http2OkHttpTest.java | 6 +- .../testing/integration/InProcessTest.java | 4 +- .../BufferingHttp2ConnectionEncoder.java | 2 +- .../netty/CancelClientStreamCommand.java | 2 +- .../io/grpc/netty/CancelStreamCommand.java | 65 +++++++++++++++++++ .../netty/CreateStreamCommand.java | 2 +- .../netty/GoAwayClosedStreamException.java | 2 +- .../netty/GrpcSslContexts.java | 2 +- .../netty/JettyAlpnVerifier.java | 2 +- .../netty/NegotiationType.java | 2 +- .../netty/NettyChannelBuilder.java | 9 ++- .../netty/NettyClientHandler.java | 8 +-- .../netty/NettyClientStream.java | 8 +-- .../netty/NettyClientTransport.java | 9 ++- .../netty/NettyReadableBuffer.java | 4 +- .../{transport => }/netty/NettyServer.java | 6 +- .../netty/NettyServerBuilder.java | 5 +- .../netty/NettyServerHandler.java | 16 ++--- .../netty/NettyServerStream.java | 6 +- .../netty/NettyServerTransport.java | 6 +- .../netty/NettyWritableBuffer.java | 4 +- .../netty/NettyWritableBufferAllocator.java | 6 +- .../netty/ProtocolNegotiator.java | 2 +- .../netty/ProtocolNegotiators.java | 2 +- .../netty/RequestMessagesCommand.java | 4 +- .../netty/SendGrpcFrameCommand.java | 4 +- .../netty/SendPingCommand.java | 4 +- .../netty/SendResponseHeadersCommand.java | 2 +- .../io/grpc/{transport => }/netty/Utils.java | 13 ++-- .../{transport => }/netty/WriteQueue.java | 2 +- .../netty/CancelServerStreamCommand.java | 2 +- .../BufferingHttp2ConnectionEncoderTest.java | 4 +- .../netty/NettyClientHandlerTest.java | 21 +++--- .../netty/NettyClientStreamTest.java | 13 ++-- .../netty/NettyClientTransportTest.java | 23 ++++--- .../netty/NettyHandlerTestBase.java | 2 +- .../netty/NettyReadableBufferTest.java | 6 +- .../netty/NettyServerHandlerTest.java | 22 +++---- .../netty/NettyServerStreamTest.java | 7 +- .../netty/NettyStreamTestBase.java | 8 +-- .../{transport => }/netty/NettyTestUtil.java | 2 +- .../NettyWritableBufferAllocatorTest.java | 8 +-- .../netty/NettyWritableBufferTest.java | 7 +- .../okhttp/AsyncFrameWriter.java | 4 +- .../grpc/{transport => }/okhttp/Headers.java | 10 +-- .../okhttp/NegotiationType.java | 2 +- .../okhttp/OkHttpChannelBuilder.java | 8 +-- .../okhttp/OkHttpClientStream.java | 8 +-- .../okhttp/OkHttpClientTransport.java | 12 ++-- .../okhttp/OkHttpClientTransportFactory.java | 6 +- .../okhttp/OkHttpReadableBuffer.java | 6 +- .../okhttp/OkHttpWritableBuffer.java | 4 +- .../okhttp/OkHttpWritableBufferAllocator.java | 6 +- .../okhttp/OutboundFlowController.java | 6 +- .../io/grpc/{transport => }/okhttp/Utils.java | 4 +- .../okhttp/OkHttpClientTransportTest.java | 20 +++--- .../okhttp/OkHttpReadableBufferTest.java | 6 +- .../OkHttpWritableBufferAllocatorTest.java | 8 +-- .../okhttp/OkHttpWritableBufferTest.java | 6 +- 132 files changed, 404 insertions(+), 339 deletions(-) rename core/src/main/java/io/grpc/{transport => }/inprocess/InProcessChannelBuilder.java (95%) rename core/src/main/java/io/grpc/{transport => }/inprocess/InProcessServer.java (94%) rename core/src/main/java/io/grpc/{transport => }/inprocess/InProcessServerBuilder.java (98%) rename core/src/main/java/io/grpc/{transport => }/inprocess/InProcessTransport.java (97%) rename core/src/main/java/io/grpc/{transport => internal}/AbstractClientStream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/AbstractReadableBuffer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/AbstractServerStream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/AbstractStream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ClientStream.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/ClientStreamListener.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ClientTransport.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ClientTransportFactory.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/CompositeReadableBuffer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ForwardingReadableBuffer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/Http2ClientStream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/Http2Ping.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/HttpUtil.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/MessageDeframer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/MessageFramer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ReadableBuffer.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ReadableBuffers.java (99%) rename core/src/main/java/io/grpc/{ => internal}/SerializingExecutor.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/Server.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/ServerListener.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/ServerStream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ServerStreamListener.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/ServerTransport.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/ServerTransportListener.java (98%) rename core/src/main/java/io/grpc/{ => internal}/SharedResourceHolder.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/Stream.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/StreamListener.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/TransportFrameUtil.java (99%) rename core/src/main/java/io/grpc/{transport => internal}/WritableBuffer.java (98%) rename core/src/main/java/io/grpc/{transport => internal}/WritableBufferAllocator.java (98%) rename core/src/test/java/io/grpc/{transport => internal}/AbstractReadableBufferTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/AbstractStreamTest.java (98%) rename core/src/test/java/io/grpc/{transport => internal}/ByteWritableBufferTest.java (98%) rename core/src/test/java/io/grpc/{transport => internal}/CompositeReadableBufferTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/HttpUtilTest.java (97%) rename core/src/test/java/io/grpc/{transport => internal}/MessageDeframerTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/MessageFramerTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/ReadableBufferTestBase.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/ReadableBuffersArrayTest.java (96%) rename core/src/test/java/io/grpc/{transport => internal}/ReadableBuffersByteBufferTest.java (98%) rename core/src/test/java/io/grpc/{ => internal}/SharedResourceHolderTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/TransportFrameUtilTest.java (99%) rename core/src/test/java/io/grpc/{transport => internal}/WritableBufferAllocatorTestBase.java (98%) rename core/src/test/java/io/grpc/{transport => internal}/WritableBufferTestBase.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/BufferingHttp2ConnectionEncoder.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/CancelClientStreamCommand.java (98%) create mode 100644 netty/src/main/java/io/grpc/netty/CancelStreamCommand.java rename netty/src/main/java/io/grpc/{transport => }/netty/CreateStreamCommand.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/GoAwayClosedStreamException.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/GrpcSslContexts.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/JettyAlpnVerifier.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/NegotiationType.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyChannelBuilder.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyClientHandler.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyClientStream.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyClientTransport.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyReadableBuffer.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyServer.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyServerBuilder.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyServerHandler.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyServerStream.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyServerTransport.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyWritableBuffer.java (96%) rename netty/src/main/java/io/grpc/{transport => }/netty/NettyWritableBufferAllocator.java (95%) rename netty/src/main/java/io/grpc/{transport => }/netty/ProtocolNegotiator.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/ProtocolNegotiators.java (99%) rename netty/src/main/java/io/grpc/{transport => }/netty/RequestMessagesCommand.java (96%) rename netty/src/main/java/io/grpc/{transport => }/netty/SendGrpcFrameCommand.java (97%) rename netty/src/main/java/io/grpc/{transport => }/netty/SendPingCommand.java (95%) rename netty/src/main/java/io/grpc/{transport => }/netty/SendResponseHeadersCommand.java (98%) rename netty/src/main/java/io/grpc/{transport => }/netty/Utils.java (96%) rename netty/src/main/java/io/grpc/{transport => }/netty/WriteQueue.java (99%) rename netty/src/test/java/io/grpc/{transport => }/netty/BufferingHttp2ConnectionEncoderTest.java (99%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyClientHandlerTest.java (97%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyClientStreamTest.java (97%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyClientTransportTest.java (96%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyHandlerTestBase.java (99%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyReadableBufferTest.java (95%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyServerHandlerTest.java (96%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyServerStreamTest.java (98%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyStreamTestBase.java (97%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyTestUtil.java (98%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyWritableBufferAllocatorTest.java (93%) rename netty/src/test/java/io/grpc/{transport => }/netty/NettyWritableBufferTest.java (95%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/AsyncFrameWriter.java (99%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/Headers.java (95%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/NegotiationType.java (98%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpChannelBuilder.java (97%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpClientStream.java (98%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpClientTransport.java (99%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpClientTransportFactory.java (95%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpReadableBuffer.java (96%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpWritableBuffer.java (96%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OkHttpWritableBufferAllocator.java (95%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/OutboundFlowController.java (98%) rename okhttp/src/main/java/io/grpc/{transport => }/okhttp/Utils.java (97%) rename okhttp/src/test/java/io/grpc/{transport => }/okhttp/OkHttpClientTransportTest.java (99%) rename okhttp/src/test/java/io/grpc/{transport => }/okhttp/OkHttpReadableBufferTest.java (95%) rename okhttp/src/test/java/io/grpc/{transport => }/okhttp/OkHttpWritableBufferAllocatorTest.java (93%) rename okhttp/src/test/java/io/grpc/{transport => }/okhttp/OkHttpWritableBufferTest.java (94%) diff --git a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java index 4792e57275..64864f54fb 100644 --- a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java +++ b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java @@ -44,7 +44,7 @@ import android.util.Log; import io.grpc.ChannelImpl; import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamRecorder; -import io.grpc.transport.okhttp.OkHttpChannelBuilder; +import io.grpc.okhttp.OkHttpChannelBuilder; import junit.framework.Assert; diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java index 20506c33a9..a822128522 100644 --- a/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java +++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java @@ -41,16 +41,16 @@ import io.grpc.AbstractServerBuilder; import io.grpc.ChannelImpl; import io.grpc.ServerImpl; import io.grpc.benchmarks.qps.AsyncServer; +import io.grpc.inprocess.InProcessChannelBuilder; +import io.grpc.inprocess.InProcessServerBuilder; +import io.grpc.netty.NegotiationType; +import io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.NettyServerBuilder; +import io.grpc.okhttp.OkHttpChannelBuilder; import io.grpc.testing.Payload; import io.grpc.testing.SimpleRequest; import io.grpc.testing.SimpleResponse; import io.grpc.testing.TestServiceGrpc; -import io.grpc.transport.inprocess.InProcessChannelBuilder; -import io.grpc.transport.inprocess.InProcessServerBuilder; -import io.grpc.transport.netty.NegotiationType; -import io.grpc.transport.netty.NettyChannelBuilder; -import io.grpc.transport.netty.NettyServerBuilder; -import io.grpc.transport.okhttp.OkHttpChannelBuilder; import io.netty.channel.local.LocalAddress; import io.netty.channel.local.LocalChannel; import io.netty.channel.local.LocalServerChannel; @@ -121,7 +121,7 @@ public class TransportBenchmark { InetSocketAddress address = new InetSocketAddress("localhost", port); serverBuilder = NettyServerBuilder.forAddress(address); channelBuilder = OkHttpChannelBuilder.forAddress("localhost", port) - .negotiationType(io.grpc.transport.okhttp.NegotiationType.PLAINTEXT); + .negotiationType(io.grpc.okhttp.NegotiationType.PLAINTEXT); break; } default: diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java index 7872f1d1bd..b1c562bdbf 100644 --- a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java +++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java @@ -16,11 +16,11 @@ import io.grpc.ServerCallHandler; import io.grpc.ServerImpl; import io.grpc.ServerServiceDefinition; import io.grpc.Status; +import io.grpc.netty.NegotiationType; +import io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.NettyServerBuilder; import io.grpc.stub.ClientCalls; import io.grpc.stub.StreamObserver; -import io.grpc.transport.netty.NegotiationType; -import io.grpc.transport.netty.NettyChannelBuilder; -import io.grpc.transport.netty.NettyServerBuilder; import io.netty.buffer.ByteBuf; import io.netty.buffer.EmptyByteBuf; import io.netty.buffer.PooledByteBufAllocator; diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java index 094d961e6a..78e292b9a7 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java @@ -36,6 +36,8 @@ import com.google.protobuf.ByteString; import io.grpc.ServerImpl; import io.grpc.Status; +import io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.NettyServerBuilder; import io.grpc.stub.StreamObserver; import io.grpc.testing.Payload; import io.grpc.testing.PayloadType; @@ -43,9 +45,6 @@ import io.grpc.testing.SimpleRequest; import io.grpc.testing.SimpleResponse; import io.grpc.testing.TestServiceGrpc; import io.grpc.testing.TestUtils; -import io.grpc.transport.netty.GrpcSslContexts; -import io.grpc.transport.netty.NettyServerBuilder; - import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/ClientConfiguration.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/ClientConfiguration.java index f853dd6b66..fbb1aebe7c 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/ClientConfiguration.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/ClientConfiguration.java @@ -39,10 +39,10 @@ import static io.grpc.testing.RpcType.UNARY; import static java.lang.Integer.parseInt; import static java.util.Arrays.asList; +import io.grpc.netty.NettyChannelBuilder; import io.grpc.testing.PayloadType; import io.grpc.testing.RpcType; import io.grpc.testing.TestUtils; -import io.grpc.transport.netty.NettyChannelBuilder; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/ServerConfiguration.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/ServerConfiguration.java index c9fee0272b..f8bc70490b 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/ServerConfiguration.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/ServerConfiguration.java @@ -36,8 +36,8 @@ import static io.grpc.benchmarks.qps.SocketAddressValidator.UDS; import static io.grpc.benchmarks.qps.Utils.parseBoolean; import static java.lang.Integer.parseInt; +import io.grpc.netty.NettyChannelBuilder; import io.grpc.testing.TestUtils; -import io.grpc.transport.netty.NettyChannelBuilder; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/Utils.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/Utils.java index 53d0e6b4dd..6448979fba 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/Utils.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/Utils.java @@ -35,14 +35,13 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; import io.grpc.Channel; +import io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.NegotiationType; +import io.grpc.netty.NettyChannelBuilder; +import io.grpc.okhttp.OkHttpChannelBuilder; import io.grpc.testing.Payload; import io.grpc.testing.SimpleRequest; import io.grpc.testing.TestUtils; -import io.grpc.transport.netty.GrpcSslContexts; -import io.grpc.transport.netty.NegotiationType; -import io.grpc.transport.netty.NettyChannelBuilder; -import io.grpc.transport.okhttp.OkHttpChannelBuilder; - import io.netty.channel.EventLoopGroup; import io.netty.channel.epoll.EpollDomainSocketChannel; import io.netty.channel.epoll.EpollEventLoopGroup; @@ -134,8 +133,8 @@ final class Utils { OkHttpChannelBuilder builder = OkHttpChannelBuilder .forAddress(addr.getHostName(), addr.getPort()) .executor(config.directExecutor ? MoreExecutors.newDirectExecutorService() : null); - builder.negotiationType(config.tls ? io.grpc.transport.okhttp.NegotiationType.TLS - : io.grpc.transport.okhttp.NegotiationType.PLAINTEXT); + builder.negotiationType(config.tls ? io.grpc.okhttp.NegotiationType.TLS + : io.grpc.okhttp.NegotiationType.PLAINTEXT); if (config.tls) { SSLSocketFactory factory; if (config.testca) { diff --git a/core/src/main/java/io/grpc/AbstractChannelBuilder.java b/core/src/main/java/io/grpc/AbstractChannelBuilder.java index c4e66f8398..c9662027e0 100644 --- a/core/src/main/java/io/grpc/AbstractChannelBuilder.java +++ b/core/src/main/java/io/grpc/AbstractChannelBuilder.java @@ -34,8 +34,9 @@ package io.grpc; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.grpc.SharedResourceHolder.Resource; -import io.grpc.transport.ClientTransportFactory; +import io.grpc.internal.ClientTransportFactory; +import io.grpc.internal.SharedResourceHolder; +import io.grpc.internal.SharedResourceHolder.Resource; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/io/grpc/AbstractServerBuilder.java b/core/src/main/java/io/grpc/AbstractServerBuilder.java index 64447489b7..dd3e79b102 100644 --- a/core/src/main/java/io/grpc/AbstractServerBuilder.java +++ b/core/src/main/java/io/grpc/AbstractServerBuilder.java @@ -35,6 +35,8 @@ import static io.grpc.AbstractChannelBuilder.DEFAULT_EXECUTOR; import com.google.common.base.Preconditions; +import io.grpc.internal.SharedResourceHolder; + import java.util.concurrent.ExecutorService; import javax.annotation.Nullable; @@ -138,7 +140,7 @@ public abstract class AbstractServerBuilder