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}

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;
 

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:

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;

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;

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;

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;

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) {

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;

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<BuilderT extends AbstractServerBuild
    * The essentials required for creating a server.
    */
   protected static class ServerEssentials {
-    final io.grpc.transport.Server server;
+    final io.grpc.internal.Server server;
     @Nullable
     final Runnable terminationRunnable;
 
@@ -148,7 +150,7 @@ public abstract class AbstractServerBuilder<BuilderT extends AbstractServerBuild
      * @param server the created server uses this server to accept transports
      * @param terminationRunnable will be called at the server termination
      */
-    public ServerEssentials(io.grpc.transport.Server server,
+    public ServerEssentials(io.grpc.internal.Server server,
         @Nullable Runnable terminationRunnable) {
       this.server = Preconditions.checkNotNull(server, "server");
       this.terminationRunnable = terminationRunnable;

core/src/main/java/io/grpc/ChannelImpl.java

@@ -36,12 +36,14 @@ import com.google.common.base.Preconditions;
 
 import io.grpc.ClientCallImpl.ClientTransportProvider;
 import io.grpc.Metadata.Headers;
-import io.grpc.transport.ClientStream;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.ClientTransport.PingCallback;
-import io.grpc.transport.ClientTransportFactory;
-import io.grpc.transport.HttpUtil;
+import io.grpc.internal.ClientStream;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.ClientTransport.PingCallback;
+import io.grpc.internal.ClientTransportFactory;
+import io.grpc.internal.HttpUtil;
+import io.grpc.internal.SerializingExecutor;
+import io.grpc.internal.SharedResourceHolder;
 
 import java.util.ArrayList;
 import java.util.Collection;

core/src/main/java/io/grpc/ClientCallImpl.java

@@ -37,10 +37,11 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 
 import io.grpc.MethodDescriptor.MethodType;
-import io.grpc.transport.ClientStream;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.HttpUtil;
+import io.grpc.internal.ClientStream;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.HttpUtil;
+import io.grpc.internal.SerializingExecutor;
 
 import java.io.InputStream;
 import java.util.concurrent.ScheduledExecutorService;

core/src/main/java/io/grpc/Context.java

@@ -35,6 +35,8 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
+import io.grpc.internal.SharedResourceHolder;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -51,7 +53,6 @@ import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
-
 /**
  * A context propagation mechanism which carries deadlines, cancellation signals,
  * and other scoped values across API boundaries and between threads. Examples of functionality

core/src/main/java/io/grpc/ServerImpl.java

@@ -37,11 +37,13 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.Futures;
 
-import io.grpc.transport.ServerListener;
-import io.grpc.transport.ServerStream;
-import io.grpc.transport.ServerStreamListener;
-import io.grpc.transport.ServerTransport;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.SerializingExecutor;
+import io.grpc.internal.ServerListener;
+import io.grpc.internal.ServerStream;
+import io.grpc.internal.ServerStreamListener;
+import io.grpc.internal.ServerTransport;
+import io.grpc.internal.ServerTransportListener;
+import io.grpc.internal.SharedResourceHolder;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -80,7 +82,7 @@ public final class ServerImpl extends Server {
   private boolean terminated;
   private Runnable terminationRunnable;
   /** Service encapsulating something similar to an accept() socket. */
-  private final io.grpc.transport.Server transportServer;
+  private final io.grpc.internal.Server transportServer;
   private final Object lock = new Object();
   private boolean transportServerTerminated;
   /** {@code transportServer} and services encapsulating something similar to a TCP connection. */
@@ -95,7 +97,7 @@ public final class ServerImpl extends Server {
    * @param registry of methods to expose to remote clients.
    */
   public ServerImpl(Executor executor, HandlerRegistry registry,
-      io.grpc.transport.Server transportServer) {
+      io.grpc.internal.Server transportServer) {
     this.executor = Preconditions.checkNotNull(executor, "executor");
     this.registry = Preconditions.checkNotNull(registry, "registry");
     this.transportServer = Preconditions.checkNotNull(transportServer, "transportServer");

core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java

@@ -29,13 +29,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.inprocess;
+package io.grpc.inprocess;
 
 import com.google.common.base.Preconditions;
 
 import io.grpc.AbstractChannelBuilder;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.ClientTransportFactory;
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.ClientTransportFactory;
 
 /**
  * Builder for a channel that issues in-process requests. Clients identify the in-process server by

core/src/main/java/io/grpc/inprocess/InProcessServer.java

@@ -29,11 +29,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.inprocess;
+package io.grpc.inprocess;
 
-import io.grpc.transport.Server;
-import io.grpc.transport.ServerListener;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.Server;
+import io.grpc.internal.ServerListener;
+import io.grpc.internal.ServerTransportListener;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;

core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.inprocess;
+package io.grpc.inprocess;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/io/grpc/inprocess/InProcessTransport.java

@@ -29,18 +29,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.inprocess;
+package io.grpc.inprocess;
 
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
-import io.grpc.transport.ClientStream;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.ServerStream;
-import io.grpc.transport.ServerStreamListener;
-import io.grpc.transport.ServerTransport;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.ClientStream;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.ServerStream;
+import io.grpc.internal.ServerStreamListener;
+import io.grpc.internal.ServerTransport;
+import io.grpc.internal.ServerTransportListener;
 
 import java.io.InputStream;
 import java.util.ArrayDeque;

core/src/main/java/io/grpc/internal/AbstractClientStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static io.grpc.Status.Code.CANCELLED;
 import static io.grpc.Status.Code.DEADLINE_EXCEEDED;

core/src/main/java/io/grpc/internal/AbstractReadableBuffer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /**
  * Abstract base class for {@link ReadableBuffer} implementations.

core/src/main/java/io/grpc/internal/AbstractServerStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

core/src/main/java/io/grpc/internal/AbstractStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;

core/src/main/java/io/grpc/internal/ClientStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Status;
 

core/src/main/java/io/grpc/internal/ClientStreamListener.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Metadata;
 import io.grpc.Status;

core/src/main/java/io/grpc/internal/ClientTransport.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;

core/src/main/java/io/grpc/internal/ClientTransportFactory.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /** Pre-configured factory for creating {@link ClientTransport} instances. */
 public interface ClientTransportFactory {

core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import java.io.IOException;
 import java.io.OutputStream;

core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/io/grpc/internal/Http2ClientStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;

core/src/main/java/io/grpc/internal/Http2Ping.java

@@ -29,12 +29,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Maps;
 
-import io.grpc.transport.ClientTransport.PingCallback;
+import io.grpc.internal.ClientTransport.PingCallback;
 
 import java.util.Map;
 import java.util.concurrent.Executor;

core/src/main/java/io/grpc/internal/HttpUtil.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Metadata;
 import io.grpc.Status;

core/src/main/java/io/grpc/internal/MessageDeframer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/io/grpc/internal/MessageFramer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static java.lang.Math.min;
 

core/src/main/java/io/grpc/internal/ReadableBuffer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import java.io.Closeable;
 import java.io.IOException;

core/src/main/java/io/grpc/internal/ReadableBuffers.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
 

core/src/main/java/io/grpc/internal/SerializingExecutor.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc;
+package io.grpc.internal;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/io/grpc/internal/Server.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import java.io.IOException;
 

core/src/main/java/io/grpc/internal/ServerListener.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /**
  * A listener to a server for transport creation events. The listener need not be thread-safe, so

core/src/main/java/io/grpc/internal/ServerStream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Metadata;
 import io.grpc.Status;

core/src/main/java/io/grpc/internal/ServerStreamListener.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Status;
 

core/src/main/java/io/grpc/internal/ServerTransport.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /** An inbound connection. */
 public interface ServerTransport {

core/src/main/java/io/grpc/internal/ServerTransportListener.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import io.grpc.Metadata;
 

core/src/main/java/io/grpc/internal/SharedResourceHolder.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc;
+package io.grpc.internal;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/io/grpc/internal/Stream.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import java.io.InputStream;
 

core/src/main/java/io/grpc/internal/StreamListener.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import java.io.InputStream;
 

core/src/main/java/io/grpc/internal/TransportFrameUtil.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.US_ASCII;
 

core/src/main/java/io/grpc/internal/WritableBuffer.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /**
  * An interface for a byte buffer that can only be written to.

core/src/main/java/io/grpc/internal/WritableBufferAllocator.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 /**
  * An allocator of buffers provided by the transport implementation to {@link MessageFramer} so

core/src/test/java/io/grpc/ChannelImplTest.java

@@ -47,10 +47,10 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import io.grpc.transport.ClientStream;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.ClientTransportFactory;
+import io.grpc.internal.ClientStream;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.ClientTransportFactory;
 
 import org.junit.After;
 import org.junit.Before;

core/src/test/java/io/grpc/ServerImplTest.java

@@ -45,11 +45,11 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import io.grpc.MethodDescriptor.MethodType;
-import io.grpc.transport.ServerListener;
-import io.grpc.transport.ServerStream;
-import io.grpc.transport.ServerStreamListener;
-import io.grpc.transport.ServerTransport;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.ServerListener;
+import io.grpc.internal.ServerStream;
+import io.grpc.internal.ServerStreamListener;
+import io.grpc.internal.ServerTransport;
+import io.grpc.internal.ServerTransportListener;
 
 import org.junit.After;
 import org.junit.Before;
@@ -373,7 +373,7 @@ public class ServerImplTest {
     return barrier;
   }
 
-  private static class SimpleServer implements io.grpc.transport.Server {
+  private static class SimpleServer implements io.grpc.internal.Server {
     ServerListener listener;
 
     @Override

core/src/test/java/io/grpc/internal/AbstractReadableBufferTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;

core/src/test/java/io/grpc/internal/AbstractStreamTest.java

@@ -30,7 +30,7 @@
  */
 
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.verify;
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 
-import io.grpc.transport.AbstractStream.Phase;
+import io.grpc.internal.AbstractStream.Phase;
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/io/grpc/internal/ByteWritableBufferTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import org.junit.Before;
 

core/src/test/java/io/grpc/internal/CompositeReadableBufferTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;

core/src/test/java/io/grpc/internal/HttpUtilTest.java

@@ -29,13 +29,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import io.grpc.Status;
-import io.grpc.transport.HttpUtil.Http2Error;
+import io.grpc.internal.HttpUtil.Http2Error;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

core/src/test/java/io/grpc/internal/MessageDeframerTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import com.google.common.io.ByteStreams;
 import com.google.common.primitives.Bytes;
 
-import io.grpc.transport.MessageDeframer.Listener;
+import io.grpc.internal.MessageDeframer.Listener;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

core/src/test/java/io/grpc/internal/MessageFramerTest.java

@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
-import static io.grpc.transport.MessageFramer.Compression;
+import static io.grpc.internal.MessageFramer.Compression;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;

core/src/test/java/io/grpc/internal/ReadableBufferTestBase.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertArrayEquals;

core/src/test/java/io/grpc/internal/ReadableBuffersArrayTest.java

@@ -29,10 +29,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
-import static io.grpc.transport.ReadableBuffers.wrap;
+import static io.grpc.internal.ReadableBuffers.wrap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;

core/src/test/java/io/grpc/internal/ReadableBuffersByteBufferTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
 

core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -43,7 +43,7 @@ import static org.mockito.Matchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import io.grpc.SharedResourceHolder.Resource;
+import io.grpc.internal.SharedResourceHolder.Resource;
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static com.google.common.base.Charsets.US_ASCII;
 import static com.google.common.base.Charsets.UTF_8;

core/src/test/java/io/grpc/internal/WritableBufferAllocatorTestBase.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertNotSame;
 

core/src/test/java/io/grpc/internal/WritableBufferTestBase.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport;
+package io.grpc.internal;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java

@@ -38,8 +38,8 @@ import io.grpc.ClientInterceptors;
 import io.grpc.examples.helloworld.GreeterGrpc;
 import io.grpc.examples.helloworld.HelloRequest;
 import io.grpc.examples.helloworld.HelloResponse;
-import io.grpc.transport.netty.NegotiationType;
-import io.grpc.transport.netty.NettyChannelBuilder;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
 
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;

examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java

@@ -36,8 +36,8 @@ import io.grpc.ServerInterceptors;
 import io.grpc.examples.helloworld.GreeterGrpc;
 import io.grpc.examples.helloworld.HelloRequest;
 import io.grpc.examples.helloworld.HelloResponse;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.grpc.transport.netty.NettyServerBuilder;
 
 import java.util.logging.Logger;
 

examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java

@@ -32,8 +32,8 @@
 package io.grpc.examples.helloworld;
 
 import io.grpc.ChannelImpl;
-import io.grpc.transport.netty.NegotiationType;
-import io.grpc.transport.netty.NettyChannelBuilder;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
 
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;

examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java

@@ -32,8 +32,8 @@
 package io.grpc.examples.helloworld;
 
 import io.grpc.ServerImpl;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.grpc.transport.netty.NettyServerBuilder;
 
 import java.util.logging.Logger;
 

examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java

@@ -36,9 +36,9 @@ import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.ChannelImpl;
 import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideBlockingStub;
 import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideStub;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
 import io.grpc.stub.StreamObserver;
-import io.grpc.transport.netty.NegotiationType;
-import io.grpc.transport.netty.NettyChannelBuilder;
 
 import java.util.Iterator;
 import java.util.List;

examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java

@@ -41,8 +41,8 @@ import static java.lang.Math.toRadians;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import io.grpc.ServerImpl;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.grpc.transport.netty.NettyServerBuilder;
 
 import java.io.IOException;
 import java.net.URL;

interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java

@@ -34,11 +34,11 @@ package io.grpc.testing.integration;
 import com.google.common.io.Files;
 
 import io.grpc.ChannelImpl;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.okhttp.OkHttpChannelBuilder;
 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.handler.ssl.SslContext;
 
 import java.io.File;

interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java

@@ -35,9 +35,9 @@ import com.google.common.util.concurrent.MoreExecutors;
 
 import io.grpc.ServerImpl;
 import io.grpc.ServerInterceptors;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.testing.TestUtils;
-import io.grpc.transport.netty.GrpcSslContexts;
-import io.grpc.transport.netty.NettyServerBuilder;
 import io.netty.handler.ssl.SslContext;
 
 import java.util.concurrent.Executors;

interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java

@@ -32,9 +32,9 @@
 package io.grpc.testing.integration;
 
 import io.grpc.ChannelImpl;
-import io.grpc.transport.netty.NegotiationType;
-import io.grpc.transport.netty.NettyChannelBuilder;
-import io.grpc.transport.netty.NettyServerBuilder;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.NettyServerBuilder;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalChannel;
 import io.netty.channel.local.LocalServerChannel;

interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java

@@ -32,10 +32,10 @@
 package io.grpc.testing.integration;
 
 import io.grpc.ChannelImpl;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.NettyServerBuilder;
 import io.grpc.testing.TestUtils;
-import io.grpc.transport.netty.GrpcSslContexts;
-import io.grpc.transport.netty.NettyChannelBuilder;
-import io.grpc.transport.netty.NettyServerBuilder;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 
 import org.junit.AfterClass;

interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java

@@ -35,10 +35,10 @@ import com.squareup.okhttp.ConnectionSpec;
 import com.squareup.okhttp.TlsVersion;
 
 import io.grpc.ChannelImpl;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyServerBuilder;
+import io.grpc.okhttp.OkHttpChannelBuilder;
 import io.grpc.testing.TestUtils;
-import io.grpc.transport.netty.GrpcSslContexts;
-import io.grpc.transport.netty.NettyServerBuilder;
-import io.grpc.transport.okhttp.OkHttpChannelBuilder;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 
 import org.junit.AfterClass;

interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java

@@ -32,8 +32,8 @@
 package io.grpc.testing.integration;
 
 import io.grpc.ChannelImpl;
-import io.grpc.transport.inprocess.InProcessChannelBuilder;
-import io.grpc.transport.inprocess.InProcessServerBuilder;
+import io.grpc.inprocess.InProcessChannelBuilder;
+import io.grpc.inprocess.InProcessServerBuilder;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

netty/src/main/java/io/grpc/netty/BufferingHttp2ConnectionEncoder.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static io.netty.handler.codec.http2.Http2Error.PROTOCOL_ERROR;
 import static io.netty.handler.codec.http2.Http2Exception.connectionError;

netty/src/main/java/io/grpc/netty/CancelClientStreamCommand.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static io.grpc.Status.Code.CANCELLED;
 import static io.grpc.Status.Code.DEADLINE_EXCEEDED;

netty/src/main/java/io/grpc/netty/CancelStreamCommand.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ *    * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package io.grpc.netty;
+
+import static io.grpc.Status.Code.CANCELLED;
+import static io.grpc.Status.Code.DEADLINE_EXCEEDED;
+
+import com.google.common.base.Preconditions;
+
+import io.grpc.Status;
+
+import java.util.EnumSet;
+
+/**
+ * Command sent from a Netty client stream to the handler to cancel the stream.
+ */
+class CancelStreamCommand {
+  private final NettyClientStream stream;
+  private final Status reason;
+
+  CancelStreamCommand(NettyClientStream stream, Status reason) {
+    this.stream = Preconditions.checkNotNull(stream, "stream");
+    Preconditions.checkNotNull(reason);
+    Preconditions.checkArgument(EnumSet.of(CANCELLED, DEADLINE_EXCEEDED).contains(reason.getCode()),
+        "Invalid cancellation reason");
+    this.reason = reason;
+  }
+
+  NettyClientStream stream() {
+    return stream;
+  }
+
+  Status reason() {
+    return reason;
+  }
+}

netty/src/main/java/io/grpc/netty/CreateStreamCommand.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 

netty/src/main/java/io/grpc/netty/GoAwayClosedStreamException.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import io.netty.buffer.ByteBuf;
 

netty/src/main/java/io/grpc/netty/GrpcSslContexts.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;

netty/src/main/java/io/grpc/netty/JettyAlpnVerifier.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 /**
  * Utility class that verifies that Jetty ALPN is properly configured for the system.

netty/src/main/java/io/grpc/netty/NegotiationType.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 /**
  * Identifies the negotiation used for starting up HTTP/2.

netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java

@@ -29,15 +29,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 
 import io.grpc.AbstractChannelBuilder;
-import io.grpc.SharedResourceHolder;
-import io.grpc.transport.ClientTransport;
-import io.grpc.transport.ClientTransportFactory;
-
+import io.grpc.internal.ClientTransport;
+import io.grpc.internal.ClientTransportFactory;
+import io.grpc.internal.SharedResourceHolder;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;

netty/src/main/java/io/grpc/netty/NettyClientHandler.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static io.netty.handler.codec.http2.Http2CodecUtil.getEmbeddedHttp2Exception;
 import static io.netty.util.CharsetUtil.UTF_8;
@@ -41,9 +41,9 @@ import com.google.common.base.Ticker;
 
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.grpc.transport.ClientTransport.PingCallback;
-import io.grpc.transport.Http2Ping;
-import io.grpc.transport.HttpUtil;
+import io.grpc.internal.ClientTransport.PingCallback;
+import io.grpc.internal.Http2Ping;
+import io.grpc.internal.HttpUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;

netty/src/main/java/io/grpc/netty/NettyClientStream.java

@@ -29,16 +29,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static io.netty.buffer.Unpooled.EMPTY_BUFFER;
 
 import io.grpc.Status;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.Http2ClientStream;
-import io.grpc.transport.WritableBuffer;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.Http2ClientStream;
+import io.grpc.internal.WritableBuffer;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

netty/src/main/java/io/grpc/netty/NettyClientTransport.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
@@ -38,10 +38,9 @@ import com.google.common.base.Preconditions;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
-import io.grpc.transport.ClientStream;
-import io.grpc.transport.ClientStreamListener;
-import io.grpc.transport.ClientTransport;
-
+import io.grpc.internal.ClientStream;
+import io.grpc.internal.ClientStreamListener;
+import io.grpc.internal.ClientTransport;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

netty/src/main/java/io/grpc/netty/NettyReadableBuffer.java

@@ -29,12 +29,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 
-import io.grpc.transport.AbstractReadableBuffer;
+import io.grpc.internal.AbstractReadableBuffer;
 import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;

netty/src/main/java/io/grpc/netty/NettyServer.java

@@ -29,15 +29,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static io.netty.channel.ChannelOption.SO_BACKLOG;
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
 import com.google.common.base.Preconditions;
 
-import io.grpc.transport.Server;
-import io.grpc.transport.ServerListener;
+import io.grpc.internal.Server;
+import io.grpc.internal.ServerListener;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

netty/src/main/java/io/grpc/netty/NettyServerBuilder.java

@@ -29,14 +29,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 
 import io.grpc.AbstractServerBuilder;
 import io.grpc.HandlerRegistry;
-import io.grpc.SharedResourceHolder;
-
+import io.grpc.internal.SharedResourceHolder;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.ServerChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;

netty/src/main/java/io/grpc/netty/NettyServerHandler.java

@@ -29,19 +29,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import static io.grpc.transport.netty.Utils.CONTENT_TYPE_GRPC;
-import static io.grpc.transport.netty.Utils.CONTENT_TYPE_HEADER;
-import static io.grpc.transport.netty.Utils.HTTP_METHOD;
-import static io.grpc.transport.netty.Utils.TE_HEADER;
-import static io.grpc.transport.netty.Utils.TE_TRAILERS;
+import static io.grpc.netty.Utils.CONTENT_TYPE_GRPC;
+import static io.grpc.netty.Utils.CONTENT_TYPE_HEADER;
+import static io.grpc.netty.Utils.HTTP_METHOD;
+import static io.grpc.netty.Utils.TE_HEADER;
+import static io.grpc.netty.Utils.TE_TRAILERS;
 
 import com.google.common.base.Preconditions;
 
 import io.grpc.Status;
-import io.grpc.transport.ServerStreamListener;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.ServerStreamListener;
+import io.grpc.internal.ServerTransportListener;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

netty/src/main/java/io/grpc/netty/NettyServerStream.java

@@ -29,14 +29,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import io.grpc.Metadata;
 import io.grpc.Status;
-import io.grpc.transport.AbstractServerStream;
-import io.grpc.transport.WritableBuffer;
+import io.grpc.internal.AbstractServerStream;
+import io.grpc.internal.WritableBuffer;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

netty/src/main/java/io/grpc/netty/NettyServerTransport.java

@@ -29,12 +29,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 
-import io.grpc.transport.ServerTransport;
-import io.grpc.transport.ServerTransportListener;
+import io.grpc.internal.ServerTransport;
+import io.grpc.internal.ServerTransportListener;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

netty/src/main/java/io/grpc/netty/NettyWritableBuffer.java

@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import io.grpc.transport.WritableBuffer;
+import io.grpc.internal.WritableBuffer;
 import io.netty.buffer.ByteBuf;
 
 /**

netty/src/main/java/io/grpc/netty/NettyWritableBufferAllocator.java

@@ -29,10 +29,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import io.grpc.transport.WritableBuffer;
-import io.grpc.transport.WritableBufferAllocator;
+import io.grpc.internal.WritableBuffer;
+import io.grpc.internal.WritableBufferAllocator;
 import io.netty.buffer.ByteBufAllocator;
 
 /**

netty/src/main/java/io/grpc/netty/ProtocolNegotiator.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.handler.codec.http2.Http2ConnectionHandler;

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
 import com.google.common.base.Preconditions;
 

netty/src/main/java/io/grpc/netty/RequestMessagesCommand.java

@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import io.grpc.transport.AbstractStream;
+import io.grpc.internal.AbstractStream;
 
 /**
  * Command which requests messages from the deframer.

netty/src/main/java/io/grpc/netty/SendGrpcFrameCommand.java

@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import io.grpc.transport.AbstractStream;
+import io.grpc.internal.AbstractStream;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;
 import io.netty.buffer.DefaultByteBufHolder;

netty/src/main/java/io/grpc/netty/SendPingCommand.java

@@ -29,9 +29,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.transport.netty;
+package io.grpc.netty;
 
-import io.grpc.transport.ClientTransport.PingCallback;
+import io.grpc.internal.ClientTransport.PingCallback;
 
 import java.util.concurrent.Executor;