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}
diff --git a/core/src/main/java/io/grpc/AbstractChannelBuilder.java b/core/src/main/java/io/grpc/AbstractChannelBuilder.java
index c4e66f8..c966202 100644
--- a/core/src/main/java/io/grpc/AbstractChannelBuilder.java
+++ b/core/src/main/java/io/grpc/AbstractChannelBuilder.java
@@ -34,8 +34,9 @@
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 6444748..dd3e79b 100644
--- a/core/src/main/java/io/grpc/AbstractServerBuilder.java
+++ b/core/src/main/java/io/grpc/AbstractServerBuilder.java
@@ -35,6 +35,8 @@
import com.google.common.base.Preconditions;
+import io.grpc.internal.SharedResourceHolder;
+
import java.util.concurrent.ExecutorService;
import javax.annotation.Nullable;
@@ -138,7 +140,7 @@
* 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 @@
* @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;
diff --git a/core/src/main/java/io/grpc/ChannelImpl.java b/core/src/main/java/io/grpc/ChannelImpl.java
index 7e18ecf..11ae249 100644
--- a/core/src/main/java/io/grpc/ChannelImpl.java
+++ b/core/src/main/java/io/grpc/ChannelImpl.java
@@ -36,12 +36,14 @@
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;
diff --git a/core/src/main/java/io/grpc/ClientCallImpl.java b/core/src/main/java/io/grpc/ClientCallImpl.java
index 835fee4..3261432 100644
--- a/core/src/main/java/io/grpc/ClientCallImpl.java
+++ b/core/src/main/java/io/grpc/ClientCallImpl.java
@@ -37,10 +37,11 @@
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;
diff --git a/core/src/main/java/io/grpc/Context.java b/core/src/main/java/io/grpc/Context.java
index 78cec9f..873adff 100644
--- a/core/src/main/java/io/grpc/Context.java
+++ b/core/src/main/java/io/grpc/Context.java
@@ -35,6 +35,8 @@
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 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
diff --git a/core/src/main/java/io/grpc/ServerImpl.java b/core/src/main/java/io/grpc/ServerImpl.java
index b619233..6d94801 100644
--- a/core/src/main/java/io/grpc/ServerImpl.java
+++ b/core/src/main/java/io/grpc/ServerImpl.java
@@ -37,11 +37,13 @@
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 @@
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 @@
* @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");
diff --git a/core/src/main/java/io/grpc/transport/inprocess/InProcessChannelBuilder.java b/core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java
similarity index 95%
rename from core/src/main/java/io/grpc/transport/inprocess/InProcessChannelBuilder.java
rename to core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java
index 75be5e3..b1b7a57 100644
--- a/core/src/main/java/io/grpc/transport/inprocess/InProcessChannelBuilder.java
+++ b/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
diff --git a/core/src/main/java/io/grpc/transport/inprocess/InProcessServer.java b/core/src/main/java/io/grpc/inprocess/InProcessServer.java
similarity index 94%
rename from core/src/main/java/io/grpc/transport/inprocess/InProcessServer.java
rename to core/src/main/java/io/grpc/inprocess/InProcessServer.java
index 293ed7b..b90ddf5 100644
--- a/core/src/main/java/io/grpc/transport/inprocess/InProcessServer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/inprocess/InProcessServerBuilder.java b/core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/inprocess/InProcessServerBuilder.java
rename to core/src/main/java/io/grpc/inprocess/InProcessServerBuilder.java
index f34ed5a..667a1aa 100644
--- a/core/src/main/java/io/grpc/transport/inprocess/InProcessServerBuilder.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/inprocess/InProcessTransport.java b/core/src/main/java/io/grpc/inprocess/InProcessTransport.java
similarity index 97%
rename from core/src/main/java/io/grpc/transport/inprocess/InProcessTransport.java
rename to core/src/main/java/io/grpc/inprocess/InProcessTransport.java
index e84b13e..d7bc19c 100644
--- a/core/src/main/java/io/grpc/transport/inprocess/InProcessTransport.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/AbstractClientStream.java b/core/src/main/java/io/grpc/internal/AbstractClientStream.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/AbstractClientStream.java
rename to core/src/main/java/io/grpc/internal/AbstractClientStream.java
index 63455cc..972b2aa 100644
--- a/core/src/main/java/io/grpc/transport/AbstractClientStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/AbstractReadableBuffer.java b/core/src/main/java/io/grpc/internal/AbstractReadableBuffer.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/AbstractReadableBuffer.java
rename to core/src/main/java/io/grpc/internal/AbstractReadableBuffer.java
index ae53b3f..308a51f 100644
--- a/core/src/main/java/io/grpc/transport/AbstractReadableBuffer.java
+++ b/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.
diff --git a/core/src/main/java/io/grpc/transport/AbstractServerStream.java b/core/src/main/java/io/grpc/internal/AbstractServerStream.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/AbstractServerStream.java
rename to core/src/main/java/io/grpc/internal/AbstractServerStream.java
index fc125fd..51a8680 100644
--- a/core/src/main/java/io/grpc/transport/AbstractServerStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/AbstractStream.java b/core/src/main/java/io/grpc/internal/AbstractStream.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/AbstractStream.java
rename to core/src/main/java/io/grpc/internal/AbstractStream.java
index b0c29cd..d7547e6 100644
--- a/core/src/main/java/io/grpc/transport/AbstractStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ClientStream.java b/core/src/main/java/io/grpc/internal/ClientStream.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ClientStream.java
rename to core/src/main/java/io/grpc/internal/ClientStream.java
index 20a08c7..4af75f9 100644
--- a/core/src/main/java/io/grpc/transport/ClientStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ClientStreamListener.java b/core/src/main/java/io/grpc/internal/ClientStreamListener.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ClientStreamListener.java
rename to core/src/main/java/io/grpc/internal/ClientStreamListener.java
index 62fb956..1e229a6 100644
--- a/core/src/main/java/io/grpc/transport/ClientStreamListener.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ClientTransport.java b/core/src/main/java/io/grpc/internal/ClientTransport.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/ClientTransport.java
rename to core/src/main/java/io/grpc/internal/ClientTransport.java
index 773d917..b2301dc 100644
--- a/core/src/main/java/io/grpc/transport/ClientTransport.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ClientTransportFactory.java b/core/src/main/java/io/grpc/internal/ClientTransportFactory.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ClientTransportFactory.java
rename to core/src/main/java/io/grpc/internal/ClientTransportFactory.java
index 83f31aa..a80d963 100644
--- a/core/src/main/java/io/grpc/transport/ClientTransportFactory.java
+++ b/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 {
diff --git a/core/src/main/java/io/grpc/transport/CompositeReadableBuffer.java b/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/CompositeReadableBuffer.java
rename to core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java
index 87052cc..59ea40c 100644
--- a/core/src/main/java/io/grpc/transport/CompositeReadableBuffer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ForwardingReadableBuffer.java b/core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ForwardingReadableBuffer.java
rename to core/src/main/java/io/grpc/internal/ForwardingReadableBuffer.java
index 7a42a1a..3578c7d 100644
--- a/core/src/main/java/io/grpc/transport/ForwardingReadableBuffer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/Http2ClientStream.java b/core/src/main/java/io/grpc/internal/Http2ClientStream.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/Http2ClientStream.java
rename to core/src/main/java/io/grpc/internal/Http2ClientStream.java
index aef6278..774bdb8 100644
--- a/core/src/main/java/io/grpc/transport/Http2ClientStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/Http2Ping.java b/core/src/main/java/io/grpc/internal/Http2Ping.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/Http2Ping.java
rename to core/src/main/java/io/grpc/internal/Http2Ping.java
index 204f750..804d443 100644
--- a/core/src/main/java/io/grpc/transport/Http2Ping.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/HttpUtil.java b/core/src/main/java/io/grpc/internal/HttpUtil.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/HttpUtil.java
rename to core/src/main/java/io/grpc/internal/HttpUtil.java
index 4583738..ea47505 100644
--- a/core/src/main/java/io/grpc/transport/HttpUtil.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/MessageDeframer.java b/core/src/main/java/io/grpc/internal/MessageDeframer.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/MessageDeframer.java
rename to core/src/main/java/io/grpc/internal/MessageDeframer.java
index 9aa88eb..aeb2f66 100644
--- a/core/src/main/java/io/grpc/transport/MessageDeframer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/MessageFramer.java b/core/src/main/java/io/grpc/internal/MessageFramer.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/MessageFramer.java
rename to core/src/main/java/io/grpc/internal/MessageFramer.java
index 6682948..fbcb158 100644
--- a/core/src/main/java/io/grpc/transport/MessageFramer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ReadableBuffer.java b/core/src/main/java/io/grpc/internal/ReadableBuffer.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/ReadableBuffer.java
rename to core/src/main/java/io/grpc/internal/ReadableBuffer.java
index 6b72c0f..02e268e 100644
--- a/core/src/main/java/io/grpc/transport/ReadableBuffer.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ReadableBuffers.java b/core/src/main/java/io/grpc/internal/ReadableBuffers.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/ReadableBuffers.java
rename to core/src/main/java/io/grpc/internal/ReadableBuffers.java
index ca8e435..373b9f0 100644
--- a/core/src/main/java/io/grpc/transport/ReadableBuffers.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/SerializingExecutor.java b/core/src/main/java/io/grpc/internal/SerializingExecutor.java
similarity index 99%
rename from core/src/main/java/io/grpc/SerializingExecutor.java
rename to core/src/main/java/io/grpc/internal/SerializingExecutor.java
index 65eaee1..41a0abe 100644
--- a/core/src/main/java/io/grpc/SerializingExecutor.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/Server.java b/core/src/main/java/io/grpc/internal/Server.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/Server.java
rename to core/src/main/java/io/grpc/internal/Server.java
index a5b7c27..2cbe9e0 100644
--- a/core/src/main/java/io/grpc/transport/Server.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ServerListener.java b/core/src/main/java/io/grpc/internal/ServerListener.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ServerListener.java
rename to core/src/main/java/io/grpc/internal/ServerListener.java
index 699ebbe..27e3273 100644
--- a/core/src/main/java/io/grpc/transport/ServerListener.java
+++ b/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
diff --git a/core/src/main/java/io/grpc/transport/ServerStream.java b/core/src/main/java/io/grpc/internal/ServerStream.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ServerStream.java
rename to core/src/main/java/io/grpc/internal/ServerStream.java
index 0e5fac3..717ce2f 100644
--- a/core/src/main/java/io/grpc/transport/ServerStream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ServerStreamListener.java b/core/src/main/java/io/grpc/internal/ServerStreamListener.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ServerStreamListener.java
rename to core/src/main/java/io/grpc/internal/ServerStreamListener.java
index e5fa88f..5f81bb3 100644
--- a/core/src/main/java/io/grpc/transport/ServerStreamListener.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/ServerTransport.java b/core/src/main/java/io/grpc/internal/ServerTransport.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ServerTransport.java
rename to core/src/main/java/io/grpc/internal/ServerTransport.java
index 8bc0581..f78bff9 100644
--- a/core/src/main/java/io/grpc/transport/ServerTransport.java
+++ b/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 {
diff --git a/core/src/main/java/io/grpc/transport/ServerTransportListener.java b/core/src/main/java/io/grpc/internal/ServerTransportListener.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/ServerTransportListener.java
rename to core/src/main/java/io/grpc/internal/ServerTransportListener.java
index a0af53e..cb5b9af 100644
--- a/core/src/main/java/io/grpc/transport/ServerTransportListener.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/SharedResourceHolder.java b/core/src/main/java/io/grpc/internal/SharedResourceHolder.java
similarity index 99%
rename from core/src/main/java/io/grpc/SharedResourceHolder.java
rename to core/src/main/java/io/grpc/internal/SharedResourceHolder.java
index 6f397fb..5e0b2c6 100644
--- a/core/src/main/java/io/grpc/SharedResourceHolder.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/Stream.java b/core/src/main/java/io/grpc/internal/Stream.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/Stream.java
rename to core/src/main/java/io/grpc/internal/Stream.java
index 9697a8c..9262778 100644
--- a/core/src/main/java/io/grpc/transport/Stream.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/StreamListener.java b/core/src/main/java/io/grpc/internal/StreamListener.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/StreamListener.java
rename to core/src/main/java/io/grpc/internal/StreamListener.java
index 4ce9f14..f18147c 100644
--- a/core/src/main/java/io/grpc/transport/StreamListener.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/TransportFrameUtil.java b/core/src/main/java/io/grpc/internal/TransportFrameUtil.java
similarity index 99%
rename from core/src/main/java/io/grpc/transport/TransportFrameUtil.java
rename to core/src/main/java/io/grpc/internal/TransportFrameUtil.java
index c4c3036..1c41d65 100644
--- a/core/src/main/java/io/grpc/transport/TransportFrameUtil.java
+++ b/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;
diff --git a/core/src/main/java/io/grpc/transport/WritableBuffer.java b/core/src/main/java/io/grpc/internal/WritableBuffer.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/WritableBuffer.java
rename to core/src/main/java/io/grpc/internal/WritableBuffer.java
index 225feb7..964adc9 100644
--- a/core/src/main/java/io/grpc/transport/WritableBuffer.java
+++ b/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.
diff --git a/core/src/main/java/io/grpc/transport/WritableBufferAllocator.java b/core/src/main/java/io/grpc/internal/WritableBufferAllocator.java
similarity index 98%
rename from core/src/main/java/io/grpc/transport/WritableBufferAllocator.java
rename to core/src/main/java/io/grpc/internal/WritableBufferAllocator.java
index 44c2f74..d4d337c 100644
--- a/core/src/main/java/io/grpc/transport/WritableBufferAllocator.java
+++ b/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
diff --git a/core/src/test/java/io/grpc/ChannelImplTest.java b/core/src/test/java/io/grpc/ChannelImplTest.java
index 1ff9424..dd4d390 100644
--- a/core/src/test/java/io/grpc/ChannelImplTest.java
+++ b/core/src/test/java/io/grpc/ChannelImplTest.java
@@ -47,10 +47,10 @@
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;
diff --git a/core/src/test/java/io/grpc/ServerImplTest.java b/core/src/test/java/io/grpc/ServerImplTest.java
index 17f73d5..b7a9e4d 100644
--- a/core/src/test/java/io/grpc/ServerImplTest.java
+++ b/core/src/test/java/io/grpc/ServerImplTest.java
@@ -45,11 +45,11 @@
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 @@
return barrier;
}
- private static class SimpleServer implements io.grpc.transport.Server {
+ private static class SimpleServer implements io.grpc.internal.Server {
ServerListener listener;
@Override
diff --git a/core/src/test/java/io/grpc/transport/AbstractReadableBufferTest.java b/core/src/test/java/io/grpc/internal/AbstractReadableBufferTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/AbstractReadableBufferTest.java
rename to core/src/test/java/io/grpc/internal/AbstractReadableBufferTest.java
index 71be905..9670c38 100644
--- a/core/src/test/java/io/grpc/transport/AbstractReadableBufferTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/AbstractStreamTest.java b/core/src/test/java/io/grpc/internal/AbstractStreamTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/AbstractStreamTest.java
rename to core/src/test/java/io/grpc/internal/AbstractStreamTest.java
index 7f5b121..d097ceb 100644
--- a/core/src/test/java/io/grpc/transport/AbstractStreamTest.java
+++ b/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 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;
diff --git a/core/src/test/java/io/grpc/transport/ByteWritableBufferTest.java b/core/src/test/java/io/grpc/internal/ByteWritableBufferTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/ByteWritableBufferTest.java
rename to core/src/test/java/io/grpc/internal/ByteWritableBufferTest.java
index b57cf4c..dac8b90 100644
--- a/core/src/test/java/io/grpc/transport/ByteWritableBufferTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/CompositeReadableBufferTest.java b/core/src/test/java/io/grpc/internal/CompositeReadableBufferTest.java
similarity index 99%
rename from core/src/test/java/io/grpc/transport/CompositeReadableBufferTest.java
rename to core/src/test/java/io/grpc/internal/CompositeReadableBufferTest.java
index 89f7718..d183050 100644
--- a/core/src/test/java/io/grpc/transport/CompositeReadableBufferTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/HttpUtilTest.java b/core/src/test/java/io/grpc/internal/HttpUtilTest.java
similarity index 97%
rename from core/src/test/java/io/grpc/transport/HttpUtilTest.java
rename to core/src/test/java/io/grpc/internal/HttpUtilTest.java
index cf5ad0f..dc937f2 100644
--- a/core/src/test/java/io/grpc/transport/HttpUtilTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/MessageDeframerTest.java b/core/src/test/java/io/grpc/internal/MessageDeframerTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/MessageDeframerTest.java
rename to core/src/test/java/io/grpc/internal/MessageDeframerTest.java
index b61591c..3cbbdfa 100644
--- a/core/src/test/java/io/grpc/transport/MessageDeframerTest.java
+++ b/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 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;
diff --git a/core/src/test/java/io/grpc/transport/MessageFramerTest.java b/core/src/test/java/io/grpc/internal/MessageFramerTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/MessageFramerTest.java
rename to core/src/test/java/io/grpc/internal/MessageFramerTest.java
index 14163c4..22dc219 100644
--- a/core/src/test/java/io/grpc/transport/MessageFramerTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/ReadableBufferTestBase.java b/core/src/test/java/io/grpc/internal/ReadableBufferTestBase.java
similarity index 99%
rename from core/src/test/java/io/grpc/transport/ReadableBufferTestBase.java
rename to core/src/test/java/io/grpc/internal/ReadableBufferTestBase.java
index ca24fa6..e9d0f2d 100644
--- a/core/src/test/java/io/grpc/transport/ReadableBufferTestBase.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/ReadableBuffersArrayTest.java b/core/src/test/java/io/grpc/internal/ReadableBuffersArrayTest.java
similarity index 96%
rename from core/src/test/java/io/grpc/transport/ReadableBuffersArrayTest.java
rename to core/src/test/java/io/grpc/internal/ReadableBuffersArrayTest.java
index d9a953d..58e7e00 100644
--- a/core/src/test/java/io/grpc/transport/ReadableBuffersArrayTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/ReadableBuffersByteBufferTest.java b/core/src/test/java/io/grpc/internal/ReadableBuffersByteBufferTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/ReadableBuffersByteBufferTest.java
rename to core/src/test/java/io/grpc/internal/ReadableBuffersByteBufferTest.java
index fbd8db2..ab4be76 100644
--- a/core/src/test/java/io/grpc/transport/ReadableBuffersByteBufferTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/SharedResourceHolderTest.java b/core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java
similarity index 98%
rename from core/src/test/java/io/grpc/SharedResourceHolderTest.java
rename to core/src/test/java/io/grpc/internal/SharedResourceHolderTest.java
index f6fa072..9a61350 100644
--- a/core/src/test/java/io/grpc/SharedResourceHolderTest.java
+++ b/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.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;
diff --git a/core/src/test/java/io/grpc/transport/TransportFrameUtilTest.java b/core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java
similarity index 99%
rename from core/src/test/java/io/grpc/transport/TransportFrameUtilTest.java
rename to core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java
index 0a9162d..73f536a 100644
--- a/core/src/test/java/io/grpc/transport/TransportFrameUtilTest.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/WritableBufferAllocatorTestBase.java b/core/src/test/java/io/grpc/internal/WritableBufferAllocatorTestBase.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/WritableBufferAllocatorTestBase.java
rename to core/src/test/java/io/grpc/internal/WritableBufferAllocatorTestBase.java
index 51c321f..cd14c29 100644
--- a/core/src/test/java/io/grpc/transport/WritableBufferAllocatorTestBase.java
+++ b/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;
diff --git a/core/src/test/java/io/grpc/transport/WritableBufferTestBase.java b/core/src/test/java/io/grpc/internal/WritableBufferTestBase.java
similarity index 98%
rename from core/src/test/java/io/grpc/transport/WritableBufferTestBase.java
rename to core/src/test/java/io/grpc/internal/WritableBufferTestBase.java
index aec2fdd..902ac29 100644
--- a/core/src/test/java/io/grpc/transport/WritableBufferTestBase.java
+++ b/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;