From 29cbef1f9ba14dab4cc3117c11bf552a1b24c597 Mon Sep 17 00:00:00 2001 From: nathanmittler Date: Mon, 27 Oct 2014 11:33:19 -0700 Subject: [PATCH] Renaming gRPC-java "newtransport" package to just "transport". ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=78596663 --- .../net/stubby/AbstractChannelBuilder.java | 2 +- .../net/stubby/AbstractServerBuilder.java | 2 +- .../com/google/net/stubby/ChannelImpl.java | 10 +++--- .../com/google/net/stubby/ServerImpl.java | 12 +++---- .../AbstractBuffer.java | 2 +- .../AbstractClientStream.java | 8 ++--- .../AbstractClientTransport.java | 2 +- .../AbstractServerStream.java | 8 ++--- .../AbstractStream.java | 2 +- .../{newtransport => transport}/Buffer.java | 2 +- .../{newtransport => transport}/Buffers.java | 2 +- .../ClientStream.java | 2 +- .../ClientStreamListener.java | 2 +- .../ClientTransport.java | 2 +- .../ClientTransportFactory.java | 2 +- .../CompositeBuffer.java | 2 +- .../CompressionFramer.java | 4 +-- .../Decompressor.java | 2 +- .../ForwardingBuffer.java | 2 +- .../{newtransport => transport}/Framer.java | 2 +- .../GrpcDeframer.java | 2 +- .../{newtransport => transport}/HttpUtil.java | 2 +- .../MessageDeframer2.java | 2 +- .../MessageFramer.java | 2 +- .../MessageFramer2.java | 2 +- .../ServerListener.java | 2 +- .../ServerStream.java | 2 +- .../ServerStreamListener.java | 2 +- .../ServerTransportListener.java | 2 +- .../{newtransport => transport}/Stream.java | 2 +- .../StreamListener.java | 2 +- .../StreamState.java | 2 +- .../TransportFrameUtil.java | 2 +- .../com/google/net/stubby/ServerImplTest.java | 6 ++-- .../AbstractBufferTest.java | 3 +- .../BufferTestBase.java | 2 +- .../BuffersArrayTest.java | 4 +-- .../BuffersByteBufferTest.java | 2 +- .../CompositeBufferTest.java | 2 +- .../CompressionFramerTest.java | 2 +- .../GrpcDeframerTest.java | 6 ++-- .../MessageDeframer2Test.java | 4 +-- .../MessageFramer2Test.java | 2 +- .../MessageFramerTest.java | 2 +- .../testing/integration/ClientBootstrap.java | 6 ++-- .../integration/TestServiceClient.java | 2 +- .../integration/TestServiceServer.java | 4 +-- .../transport}/netty/CancelStreamCommand.java | 2 +- .../transport}/netty/CreateStreamCommand.java | 2 +- .../transport}/netty/Http2Negotiator.java | 2 +- .../stubby/transport}/netty/NettyBuffer.java | 6 ++-- .../transport}/netty/NettyChannelBuilder.java | 6 ++-- .../transport}/netty/NettyClientHandler.java | 4 +-- .../transport}/netty/NettyClientStream.java | 22 ++++++------ .../netty/NettyClientTransport.java | 12 +++---- .../netty/NettyClientTransportFactory.java | 8 ++--- .../transport}/netty/NettyDecompressor.java | 10 +++--- .../stubby/transport}/netty/NettyServer.java | 4 +-- .../transport}/netty/NettyServerBuilder.java | 4 +-- .../transport}/netty/NettyServerHandler.java | 14 ++++---- .../transport}/netty/NettyServerStream.java | 10 +++--- .../netty/NettyServerTransport.java | 6 ++-- .../stubby/transport}/netty/NettyStream.java | 4 +-- .../netty/SendGrpcFrameCommand.java | 2 +- .../netty/SendResponseHeadersCommand.java | 2 +- .../net/stubby/transport}/netty/Utils.java | 4 +-- .../transport}/netty/WindowUpdateManager.java | 6 ++-- .../transport}/netty/NettyBufferTest.java | 10 +++--- .../netty/NettyClientHandlerTest.java | 14 ++++---- .../netty/NettyClientStreamTest.java | 28 +++++++-------- .../netty/NettyDecompressorTest.java | 22 ++++++------ .../netty/NettyHandlerTestBase.java | 18 +++++----- .../netty/NettyServerHandlerTest.java | 34 +++++++++---------- .../netty/NettyServerStreamTest.java | 10 +++--- .../transport}/netty/NettyStreamTestBase.java | 22 ++++++------ .../transport}/netty/NettyTestUtil.java | 4 +-- .../transport}/okhttp/AsyncFrameWriter.java | 2 +- .../net/stubby/transport}/okhttp/Headers.java | 4 +-- .../transport}/okhttp/OkHttpBuffer.java | 6 ++-- .../okhttp/OkHttpClientTransport.java | 18 +++++----- .../okhttp/OkHttpClientTransportFactory.java | 6 ++-- .../net/stubby/transport}/okhttp/Utils.java | 2 +- .../okhttp/OkHttpClientTransportTest.java | 10 +++--- .../net/stubby/testing/InProcessUtils.java | 10 +++--- 84 files changed, 247 insertions(+), 248 deletions(-) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/AbstractBuffer.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/AbstractClientStream.java (94%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/AbstractClientTransport.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/AbstractServerStream.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/AbstractStream.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/Buffer.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/Buffers.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ClientStream.java (94%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ClientStreamListener.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ClientTransport.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ClientTransportFactory.java (83%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/CompositeBuffer.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/CompressionFramer.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/Decompressor.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ForwardingBuffer.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/Framer.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/GrpcDeframer.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/HttpUtil.java (97%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/MessageDeframer2.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/MessageFramer.java (98%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/MessageFramer2.java (99%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ServerListener.java (90%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ServerStream.java (95%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ServerStreamListener.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/ServerTransportListener.java (92%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/Stream.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/StreamListener.java (96%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/StreamState.java (94%) rename core/src/main/java/com/google/net/stubby/{newtransport => transport}/TransportFrameUtil.java (97%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/AbstractBufferTest.java (96%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/BufferTestBase.java (98%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/BuffersArrayTest.java (89%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/BuffersByteBufferTest.java (88%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/CompositeBufferTest.java (99%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/CompressionFramerTest.java (98%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/GrpcDeframerTest.java (97%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/MessageDeframer2Test.java (98%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/MessageFramer2Test.java (99%) rename core/src/test/java/com/google/net/stubby/{newtransport => transport}/MessageFramerTest.java (98%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/CancelStreamCommand.java (88%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/CreateStreamCommand.java (93%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/Http2Negotiator.java (99%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyBuffer.java (93%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyChannelBuilder.java (92%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyClientHandler.java (99%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyClientStream.java (92%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyClientTransport.java (95%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyClientTransportFactory.java (92%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyDecompressor.java (95%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyServer.java (96%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyServerBuilder.java (96%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyServerHandler.java (95%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyServerStream.java (90%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyServerTransport.java (95%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/NettyStream.java (83%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/SendGrpcFrameCommand.java (97%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/SendResponseHeadersCommand.java (96%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/Utils.java (97%) rename {core/src/main/java/com/google/net/stubby/newtransport => netty/src/main/java/com/google/net/stubby/transport}/netty/WindowUpdateManager.java (97%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyBufferTest.java (84%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyClientHandlerTest.java (95%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyClientStreamTest.java (91%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyDecompressorTest.java (90%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyHandlerTestBase.java (98%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyServerHandlerTest.java (94%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyServerStreamTest.java (94%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyStreamTestBase.java (96%) rename {core/src/test/java/com/google/net/stubby/newtransport => netty/src/test/java/com/google/net/stubby/transport}/netty/NettyTestUtil.java (94%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/AsyncFrameWriter.java (99%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/Headers.java (96%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/OkHttpBuffer.java (89%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/OkHttpClientTransport.java (97%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/OkHttpClientTransportFactory.java (80%) rename {core/src/main/java/com/google/net/stubby/newtransport => okhttp/src/main/java/com/google/net/stubby/transport}/okhttp/Utils.java (94%) rename {core/src/test/java/com/google/net/stubby/newtransport => okhttp/src/test/java/com/google/net/stubby/transport}/okhttp/OkHttpClientTransportTest.java (97%) diff --git a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java index 0c5348b5a5..61a8111777 100644 --- a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java +++ b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java @@ -3,7 +3,7 @@ package com.google.net.stubby; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Service; -import com.google.net.stubby.newtransport.ClientTransportFactory; +import com.google.net.stubby.transport.ClientTransportFactory; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java index 969184b365..6e210cb937 100644 --- a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java +++ b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java @@ -2,7 +2,7 @@ package com.google.net.stubby; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Service; -import com.google.net.stubby.newtransport.ServerListener; +import com.google.net.stubby.transport.ServerListener; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/com/google/net/stubby/ChannelImpl.java b/core/src/main/java/com/google/net/stubby/ChannelImpl.java index 56d76c352a..a37883639f 100644 --- a/core/src/main/java/com/google/net/stubby/ChannelImpl.java +++ b/core/src/main/java/com/google/net/stubby/ChannelImpl.java @@ -5,15 +5,15 @@ import static com.google.common.util.concurrent.Service.State.STARTING; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractService; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import com.google.net.stubby.newtransport.ClientStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.ClientTransport; -import com.google.net.stubby.newtransport.ClientTransportFactory; +import com.google.net.stubby.transport.ClientStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.ClientTransport; +import com.google.net.stubby.transport.ClientTransportFactory; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/google/net/stubby/ServerImpl.java b/core/src/main/java/com/google/net/stubby/ServerImpl.java index ec21fddc57..962ecec031 100644 --- a/core/src/main/java/com/google/net/stubby/ServerImpl.java +++ b/core/src/main/java/com/google/net/stubby/ServerImpl.java @@ -3,23 +3,23 @@ package com.google.net.stubby; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.util.concurrent.AbstractService; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Service; import com.google.common.util.concurrent.SettableFuture; -import com.google.net.stubby.newtransport.ServerListener; -import com.google.net.stubby.newtransport.ServerStream; -import com.google.net.stubby.newtransport.ServerStreamListener; -import com.google.net.stubby.newtransport.ServerTransportListener; +import com.google.net.stubby.transport.ServerListener; +import com.google.net.stubby.transport.ServerStream; +import com.google.net.stubby.transport.ServerStreamListener; +import com.google.net.stubby.transport.ServerTransportListener; import java.io.InputStream; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.concurrent.Executor; import java.util.concurrent.Callable; +import java.util.concurrent.Executor; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java b/core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java rename to core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java index f85860d29b..0d53cf0a40 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; /** * Abstract base class for {@link Buffer} implementations. diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java similarity index 94% rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java rename to core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java index 7fbe7de92e..4141f1059f 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java @@ -1,8 +1,8 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; -import static com.google.net.stubby.newtransport.StreamState.CLOSED; -import static com.google.net.stubby.newtransport.StreamState.OPEN; -import static com.google.net.stubby.newtransport.StreamState.READ_ONLY; +import static com.google.net.stubby.transport.StreamState.CLOSED; +import static com.google.net.stubby.transport.StreamState.OPEN; +import static com.google.net.stubby.transport.StreamState.READ_ONLY; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java b/core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java rename to core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java index 1461a1e129..aa7bcff9d7 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractService; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java rename to core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java index 7864c844db..0e4a44a22d 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java @@ -1,8 +1,8 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; -import static com.google.net.stubby.newtransport.StreamState.CLOSED; -import static com.google.net.stubby.newtransport.StreamState.OPEN; -import static com.google.net.stubby.newtransport.StreamState.WRITE_ONLY; +import static com.google.net.stubby.transport.StreamState.CLOSED; +import static com.google.net.stubby.transport.StreamState.OPEN; +import static com.google.net.stubby.transport.StreamState.WRITE_ONLY; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java rename to core/src/main/java/com/google/net/stubby/transport/AbstractStream.java index 95f19740fb..c4b3a2de7d 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.base.Preconditions; import com.google.common.io.Closeables; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Buffer.java b/core/src/main/java/com/google/net/stubby/transport/Buffer.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/Buffer.java rename to core/src/main/java/com/google/net/stubby/transport/Buffer.java index 7e4be6759e..05eb65662a 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/Buffer.java +++ b/core/src/main/java/com/google/net/stubby/transport/Buffer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import java.io.Closeable; import java.io.IOException; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Buffers.java b/core/src/main/java/com/google/net/stubby/transport/Buffers.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/Buffers.java rename to core/src/main/java/com/google/net/stubby/transport/Buffers.java index cc21f50e5c..06c46a4dd9 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/Buffers.java +++ b/core/src/main/java/com/google/net/stubby/transport/Buffers.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.common.base.Charsets.UTF_8; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java b/core/src/main/java/com/google/net/stubby/transport/ClientStream.java similarity index 94% rename from core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java rename to core/src/main/java/com/google/net/stubby/transport/ClientStream.java index a2110bbb01..7848209066 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/ClientStream.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; /** * Extension of {@link Stream} to support client-side termination semantics. diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java b/core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java rename to core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java index 07b92dd7c3..d8d6a4701c 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java +++ b/core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.util.concurrent.ListenableFuture; import com.google.net.stubby.Metadata; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java b/core/src/main/java/com/google/net/stubby/transport/ClientTransport.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java rename to core/src/main/java/com/google/net/stubby/transport/ClientTransport.java index 418cf6e9ef..28cff82b50 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java +++ b/core/src/main/java/com/google/net/stubby/transport/ClientTransport.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.util.concurrent.Service; import com.google.net.stubby.Metadata; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java b/core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java similarity index 83% rename from core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java rename to core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java index fc399daff8..8acf295d5b 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java +++ b/core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; /** Pre-configured factory for creating {@link ClientTransport} instances. */ public interface ClientTransportFactory { diff --git a/core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java b/core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java rename to core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java index 3fbf521923..cc8313854a 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java +++ b/core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java b/core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java rename to core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java index 43b34847f4..65a453fa40 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java +++ b/core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java @@ -1,10 +1,10 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; import com.google.net.stubby.DeferredInputStream; -import com.google.net.stubby.newtransport.Framer.Sink; +import com.google.net.stubby.transport.Framer.Sink; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java b/core/src/main/java/com/google/net/stubby/transport/Decompressor.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java rename to core/src/main/java/com/google/net/stubby/transport/Decompressor.java index cd955b6713..60d3167ee3 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java +++ b/core/src/main/java/com/google/net/stubby/transport/Decompressor.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import java.io.Closeable; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java b/core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java rename to core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java index 3e479201cf..c891d2c2c6 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java +++ b/core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Framer.java b/core/src/main/java/com/google/net/stubby/transport/Framer.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/Framer.java rename to core/src/main/java/com/google/net/stubby/transport/Framer.java index 1e9bdf4b0f..a9b2d5d1c4 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/Framer.java +++ b/core/src/main/java/com/google/net/stubby/transport/Framer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.Status; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java b/core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java rename to core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java index 0c5b6e3160..c20394e2c3 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java +++ b/core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.net.stubby.GrpcFramingUtil.FRAME_LENGTH; import static com.google.net.stubby.GrpcFramingUtil.FRAME_TYPE_LENGTH; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java b/core/src/main/java/com/google/net/stubby/transport/HttpUtil.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java rename to core/src/main/java/com/google/net/stubby/transport/HttpUtil.java index f974aeca17..aa05927f46 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java +++ b/core/src/main/java/com/google/net/stubby/transport/HttpUtil.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.Status; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java b/core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java rename to core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java index ffe2c54207..3d7361a91c 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java +++ b/core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java b/core/src/main/java/com/google/net/stubby/transport/MessageFramer.java similarity index 98% rename from core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java rename to core/src/main/java/com/google/net/stubby/transport/MessageFramer.java index 6080cdb346..fa8a547db1 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java +++ b/core/src/main/java/com/google/net/stubby/transport/MessageFramer.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.GrpcFramingUtil; import com.google.net.stubby.Status; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java b/core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java rename to core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java index c46b54aed5..35129755aa 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java +++ b/core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerListener.java similarity index 90% rename from core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java rename to core/src/main/java/com/google/net/stubby/transport/ServerListener.java index 19f1c7a01f..1c8f728404 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java +++ b/core/src/main/java/com/google/net/stubby/transport/ServerListener.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.util.concurrent.Service; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java b/core/src/main/java/com/google/net/stubby/transport/ServerStream.java similarity index 95% rename from core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java rename to core/src/main/java/com/google/net/stubby/transport/ServerStream.java index f491d9fee4..f2127ccb79 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/ServerStream.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java rename to core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java index 1bd06c7acd..0849cf3e5f 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java +++ b/core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.Status; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java similarity index 92% rename from core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java rename to core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java index c711794bca..00aeb09607 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java +++ b/core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.net.stubby.Metadata; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Stream.java b/core/src/main/java/com/google/net/stubby/transport/Stream.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/Stream.java rename to core/src/main/java/com/google/net/stubby/transport/Stream.java index cd2e6d2007..6de7a5b3cd 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/Stream.java +++ b/core/src/main/java/com/google/net/stubby/transport/Stream.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import java.io.InputStream; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java b/core/src/main/java/com/google/net/stubby/transport/StreamListener.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java rename to core/src/main/java/com/google/net/stubby/transport/StreamListener.java index f9ef2610b1..7ab497e6ab 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java +++ b/core/src/main/java/com/google/net/stubby/transport/StreamListener.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import com.google.common.util.concurrent.ListenableFuture; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/StreamState.java b/core/src/main/java/com/google/net/stubby/transport/StreamState.java similarity index 94% rename from core/src/main/java/com/google/net/stubby/newtransport/StreamState.java rename to core/src/main/java/com/google/net/stubby/transport/StreamState.java index 5d5e967868..d102e63dfa 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/StreamState.java +++ b/core/src/main/java/com/google/net/stubby/transport/StreamState.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; /** * The state of a single {@link Stream} within a transport. diff --git a/core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java b/core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java rename to core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java index 8140120dae..021bee8402 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java +++ b/core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import javax.annotation.Nullable; diff --git a/core/src/test/java/com/google/net/stubby/ServerImplTest.java b/core/src/test/java/com/google/net/stubby/ServerImplTest.java index 825185bef7..5980b8868a 100644 --- a/core/src/test/java/com/google/net/stubby/ServerImplTest.java +++ b/core/src/test/java/com/google/net/stubby/ServerImplTest.java @@ -18,9 +18,9 @@ import com.google.common.util.concurrent.AbstractService; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Service; import com.google.common.util.concurrent.SettableFuture; -import com.google.net.stubby.newtransport.ServerStream; -import com.google.net.stubby.newtransport.ServerStreamListener; -import com.google.net.stubby.newtransport.ServerTransportListener; +import com.google.net.stubby.transport.ServerStream; +import com.google.net.stubby.transport.ServerStreamListener; +import com.google.net.stubby.transport.ServerTransportListener; import org.junit.After; import org.junit.Before; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java similarity index 96% rename from core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java rename to core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java index 7628695404..36c95698ec 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -11,7 +11,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.OngoingStubbing; - /** * Tests for {@link AbstractBuffer}. */ diff --git a/core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java b/core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java similarity index 98% rename from core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java rename to core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java index dbb78c3aed..13a8b27ed8 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java +++ b/core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.common.base.Charsets.UTF_8; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java b/core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java similarity index 89% rename from core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java rename to core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java index a6314c385e..42cfc8d112 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java @@ -1,7 +1,7 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.common.base.Charsets.UTF_8; -import static com.google.net.stubby.newtransport.Buffers.wrap; +import static com.google.net.stubby.transport.Buffers.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/com/google/net/stubby/newtransport/BuffersByteBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java similarity index 88% rename from core/src/test/java/com/google/net/stubby/newtransport/BuffersByteBufferTest.java rename to core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java index 09df5ae7fe..b45843568f 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/BuffersByteBufferTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.common.base.Charsets.UTF_8; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java similarity index 99% rename from core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java rename to core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java index 9e1210f341..0761852691 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static com.google.common.base.Charsets.UTF_8; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java b/core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java similarity index 98% rename from core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java rename to core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java index b93875abec..8c6d8fec60 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java b/core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java similarity index 97% rename from core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java rename to core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java index 7ced3a5381..07fe07ba4b 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java @@ -1,7 +1,7 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; -import static com.google.net.stubby.newtransport.TransportFrameUtil.PAYLOAD_FRAME; -import static com.google.net.stubby.newtransport.TransportFrameUtil.STATUS_FRAME; +import static com.google.net.stubby.transport.TransportFrameUtil.PAYLOAD_FRAME; +import static com.google.net.stubby.transport.TransportFrameUtil.STATUS_FRAME; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java b/core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java similarity index 98% rename from core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java rename to core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java index f66724b697..768c0976b4 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java +++ b/core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -13,7 +13,7 @@ import com.google.common.io.ByteStreams; import com.google.common.primitives.Bytes; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import com.google.net.stubby.newtransport.MessageDeframer2.Sink; +import com.google.net.stubby.transport.MessageDeframer2.Sink; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java b/core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java similarity index 99% rename from core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java rename to core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java index 8f74123aba..f4b112e613 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java +++ b/core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java b/core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java similarity index 98% rename from core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java rename to core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java index e8a76596cd..368c8bbf0a 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java +++ b/core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport; +package com.google.net.stubby.transport; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java index dca71a7542..3d074170f1 100644 --- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java +++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java @@ -4,9 +4,9 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.MoreExecutors; import com.google.net.stubby.Channel; import com.google.net.stubby.ChannelImpl; -import com.google.net.stubby.newtransport.ClientTransportFactory; -import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory; -import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransportFactory; +import com.google.net.stubby.transport.ClientTransportFactory; +import com.google.net.stubby.transport.netty.NettyClientTransportFactory; +import com.google.net.stubby.transport.okhttp.OkHttpClientTransportFactory; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java index 2fc8a581e3..407fa6a192 100644 --- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java +++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java @@ -176,7 +176,7 @@ public class TestServiceClient { String serverHost = getServerHost(argMap); int serverPort = getPort(argMap); - com.google.net.stubby.newtransport.AbstractStream.GRPC_V2_PROTOCOL = + com.google.net.stubby.transport.AbstractStream.GRPC_V2_PROTOCOL = getGrpcVersion(argMap) == 2; switch (stubType) { case BLOCKING: diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java index 5861641be6..ed9183e777 100644 --- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java +++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java @@ -5,8 +5,8 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; import com.google.net.stubby.ServerImpl; import com.google.net.stubby.ServerInterceptors; -import com.google.net.stubby.newtransport.netty.NettyServerBuilder; import com.google.net.stubby.testing.TestUtils; +import com.google.net.stubby.transport.netty.NettyServerBuilder; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.util.SelfSignedCertificate; @@ -95,7 +95,7 @@ public class TestServiceServer { Transport transport = getTransport(argMap); int port = getPort(RPC_PORT_ARG, argMap); - com.google.net.stubby.newtransport.AbstractStream.GRPC_V2_PROTOCOL = + com.google.net.stubby.transport.AbstractStream.GRPC_V2_PROTOCOL = getGrpcVersion(argMap) == 2; final TestServiceServer server = new TestServiceServer(transport, port); diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java similarity index 88% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java index ae42c75c9f..3cfd1093ad 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java similarity index 93% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java index 7e965a392b..830d958844 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java b/netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java index 4ffa7448f0..f3b02ecb80 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java similarity index 93% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java index 22a53b87d1..0b5defd902 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java @@ -1,9 +1,9 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.google.net.stubby.newtransport.AbstractBuffer; -import com.google.net.stubby.newtransport.Buffer; +import com.google.net.stubby.transport.AbstractBuffer; +import com.google.net.stubby.transport.Buffer; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java similarity index 92% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java index d7c3823eef..829fb987e8 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java @@ -1,9 +1,9 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.util.concurrent.Service; import com.google.net.stubby.AbstractChannelBuilder; -import com.google.net.stubby.newtransport.ClientTransportFactory; -import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory.NegotiationType; +import com.google.net.stubby.transport.ClientTransportFactory; +import com.google.net.stubby.transport.netty.NettyClientTransportFactory.NegotiationType; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java index e281567a5b..a4646d5ed1 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java @@ -1,6 +1,6 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.netty.NettyClientStream.PENDING_STREAM_ID; +import static com.google.net.stubby.transport.netty.NettyClientStream.PENDING_STREAM_ID; import com.google.common.base.Preconditions; import com.google.net.stubby.Metadata; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java similarity index 92% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java index bbcc8fb81e..fdf4e80928 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java @@ -1,21 +1,21 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.StreamState.CLOSED; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC; -import static com.google.net.stubby.newtransport.netty.Utils.GRPC_STATUS_HEADER; +import static com.google.net.stubby.transport.StreamState.CLOSED; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER; +import static com.google.net.stubby.transport.netty.Utils.GRPC_STATUS_HEADER; import static io.netty.util.CharsetUtil.UTF_8; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.AbstractClientStream; -import com.google.net.stubby.newtransport.Buffers; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.GrpcDeframer; -import com.google.net.stubby.newtransport.HttpUtil; -import com.google.net.stubby.newtransport.MessageDeframer2; +import com.google.net.stubby.transport.AbstractClientStream; +import com.google.net.stubby.transport.Buffers; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.GrpcDeframer; +import com.google.net.stubby.transport.HttpUtil; +import com.google.net.stubby.transport.MessageDeframer2; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java similarity index 95% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java index 28368b1420..820cefcd5f 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static io.netty.channel.ChannelOption.SO_KEEPALIVE; @@ -8,11 +8,11 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.net.stubby.Metadata; import com.google.net.stubby.MethodDescriptor; -import com.google.net.stubby.newtransport.AbstractClientTransport; -import com.google.net.stubby.newtransport.ClientStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.ClientTransport; -import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory.NegotiationType; +import com.google.net.stubby.transport.AbstractClientTransport; +import com.google.net.stubby.transport.ClientStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.ClientTransport; +import com.google.net.stubby.transport.netty.NettyClientTransportFactory.NegotiationType; import com.google.net.stubby.util.ssl.SslContextFactory; import io.netty.bootstrap.Bootstrap; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java similarity index 92% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java index 300e833dff..d6ea95cf86 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java @@ -1,12 +1,12 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; -import com.google.net.stubby.newtransport.ClientTransportFactory; - -import java.net.InetSocketAddress; +import com.google.net.stubby.transport.ClientTransportFactory; import io.netty.channel.EventLoopGroup; +import java.net.InetSocketAddress; + /** * Factory that manufactures instances of {@link NettyClientTransport}. */ diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java similarity index 95% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java index 033103126b..f9cdcbba44 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java @@ -1,13 +1,13 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH; -import static com.google.net.stubby.newtransport.TransportFrameUtil.isFlateCompressed; +import static com.google.net.stubby.transport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH; +import static com.google.net.stubby.transport.TransportFrameUtil.isFlateCompressed; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.io.Closeables; -import com.google.net.stubby.newtransport.Buffer; -import com.google.net.stubby.newtransport.Decompressor; +import com.google.net.stubby.transport.Buffer; +import com.google.net.stubby.transport.Decompressor; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java index 8b6a62cd20..02811d4964 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java @@ -1,11 +1,11 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static io.netty.channel.ChannelOption.SO_BACKLOG; import static io.netty.channel.ChannelOption.SO_KEEPALIVE; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractService; -import com.google.net.stubby.newtransport.ServerListener; +import com.google.net.stubby.transport.ServerListener; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java index 5a03818116..e340191b0f 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java @@ -1,10 +1,10 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Service; import com.google.net.stubby.AbstractServerBuilder; import com.google.net.stubby.HandlerRegistry; -import com.google.net.stubby.newtransport.ServerListener; +import com.google.net.stubby.transport.ServerListener; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java similarity index 95% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java index f360d3ba1c..3eb75e2470 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java @@ -1,17 +1,17 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER; -import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER; +import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD; import static io.netty.buffer.Unpooled.EMPTY_BUFFER; import static io.netty.handler.codec.http2.Http2CodecUtil.toByteBuf; import static io.netty.handler.codec.http2.Http2Error.NO_ERROR; import com.google.common.base.Preconditions; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.ServerStreamListener; -import com.google.net.stubby.newtransport.ServerTransportListener; -import com.google.net.stubby.newtransport.TransportFrameUtil; +import com.google.net.stubby.transport.ServerStreamListener; +import com.google.net.stubby.transport.ServerTransportListener; +import com.google.net.stubby.transport.TransportFrameUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFuture; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java similarity index 90% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java index 148fdd52c0..84ee894d12 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java @@ -1,12 +1,12 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.net.stubby.Metadata; -import com.google.net.stubby.newtransport.AbstractServerStream; -import com.google.net.stubby.newtransport.GrpcDeframer; -import com.google.net.stubby.newtransport.MessageDeframer2; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.AbstractServerStream; +import com.google.net.stubby.transport.GrpcDeframer; +import com.google.net.stubby.transport.MessageDeframer2; +import com.google.net.stubby.transport.StreamState; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java similarity index 95% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java index d802fa1992..d469b509b4 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java @@ -1,9 +1,9 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractService; -import com.google.net.stubby.newtransport.ServerListener; -import com.google.net.stubby.newtransport.ServerTransportListener; +import com.google.net.stubby.transport.ServerListener; +import com.google.net.stubby.transport.ServerTransportListener; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java similarity index 83% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java index a6589b2238..8c413f3572 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java @@ -1,6 +1,6 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import com.google.net.stubby.newtransport.Stream; +import com.google.net.stubby.transport.Stream; import io.netty.buffer.ByteBuf; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java index 1d31eef1e7..019e4f70f6 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufHolder; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java index f7d5386ec9..ae01332ccf 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java b/netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java index fc75e8b12b..a09fe395f1 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java @@ -1,8 +1,8 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import com.google.common.base.Preconditions; import com.google.net.stubby.Metadata; -import com.google.net.stubby.newtransport.HttpUtil; +import com.google.net.stubby.transport.HttpUtil; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java b/netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java rename to netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java index d7987784ca..a5a86364a9 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java +++ b/netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.DEFAULT_WINDOW_UPDATE_RATIO; import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.WINDOW_UPDATE_OFF; @@ -6,11 +6,11 @@ import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.WIN import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; -import javax.annotation.Nullable; - import io.netty.channel.Channel; import io.netty.handler.codec.http2.DefaultHttp2InboundFlowController; +import javax.annotation.Nullable; + /** * An object that manages inbound flow control for a single stream by disabling sending of HTTP/2 * {@code WINDOW_UPDATE} frames until the previously delivered message completes. diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java similarity index 84% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java index 766a90c7fa..f42fc051b6 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java @@ -1,18 +1,18 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static com.google.common.base.Charsets.UTF_8; import static org.junit.Assert.assertEquals; -import com.google.net.stubby.newtransport.Buffer; -import com.google.net.stubby.newtransport.BufferTestBase; +import com.google.net.stubby.transport.Buffer; +import com.google.net.stubby.transport.BufferTestBase; + +import io.netty.buffer.Unpooled; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import io.netty.buffer.Unpooled; - /** * Tests for {@link NettyBuffer}. */ diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java similarity index 95% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java index eb4e2857d5..4d4e0187f6 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java @@ -1,11 +1,11 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static com.google.common.base.Charsets.UTF_8; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER; -import static com.google.net.stubby.newtransport.netty.Utils.HTTPS; -import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD; -import static com.google.net.stubby.newtransport.netty.Utils.STATUS_OK; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER; +import static com.google.net.stubby.transport.netty.Utils.HTTPS; +import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD; +import static com.google.net.stubby.transport.netty.Utils.STATUS_OK; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -18,7 +18,7 @@ import static org.mockito.Mockito.when; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.StreamState; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java similarity index 91% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java index 4492027190..73c77afa71 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java @@ -1,10 +1,10 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame; -import static com.google.net.stubby.newtransport.netty.NettyTestUtil.statusFrame; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER; -import static com.google.net.stubby.newtransport.netty.Utils.STATUS_OK; +import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame; +import static com.google.net.stubby.transport.netty.NettyTestUtil.statusFrame; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER; +import static com.google.net.stubby.transport.netty.Utils.STATUS_OK; import static io.netty.util.CharsetUtil.UTF_8; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -15,9 +15,14 @@ import static org.mockito.Mockito.verify; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.AbstractStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.AbstractStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.StreamState; + +import io.netty.buffer.Unpooled; +import io.netty.handler.codec.AsciiString; +import io.netty.handler.codec.http2.DefaultHttp2Headers; +import io.netty.handler.codec.http2.Http2Headers; import org.junit.After; import org.junit.Assume; @@ -29,11 +34,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; -import io.netty.buffer.Unpooled; -import io.netty.handler.codec.AsciiString; -import io.netty.handler.codec.http2.DefaultHttp2Headers; -import io.netty.handler.codec.http2.Http2Headers; - /** * Tests for {@link NettyClientStream}. */ diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java similarity index 90% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java index 5475048523..92e9682f8e 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java @@ -1,25 +1,25 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static com.google.common.base.Charsets.UTF_8; -import static com.google.net.stubby.newtransport.Buffers.readAsStringUtf8; -import static com.google.net.stubby.newtransport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH; -import static com.google.net.stubby.newtransport.TransportFrameUtil.FLATE_FLAG; -import static com.google.net.stubby.newtransport.TransportFrameUtil.NO_COMPRESS_FLAG; +import static com.google.net.stubby.transport.Buffers.readAsStringUtf8; +import static com.google.net.stubby.transport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH; +import static com.google.net.stubby.transport.TransportFrameUtil.FLATE_FLAG; +import static com.google.net.stubby.transport.TransportFrameUtil.NO_COMPRESS_FLAG; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.net.stubby.newtransport.Buffer; -import com.google.net.stubby.newtransport.Buffers; -import com.google.net.stubby.newtransport.CompositeBuffer; +import com.google.net.stubby.transport.Buffer; +import com.google.net.stubby.transport.Buffers; +import com.google.net.stubby.transport.CompositeBuffer; + +import io.netty.buffer.Unpooled; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import io.netty.buffer.Unpooled; -import io.netty.buffer.UnpooledByteBufAllocator; - import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.util.Arrays; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java similarity index 98% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java index e1c224ea02..183e731530 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -6,14 +6,6 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; @@ -29,6 +21,14 @@ import io.netty.handler.codec.http2.Http2FrameWriter; import io.netty.handler.codec.http2.Http2Headers; import io.netty.handler.codec.http2.Http2Settings; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + /** * Base class for Netty handler unit tests. */ diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java similarity index 94% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java index d18c8b399f..af82e495c9 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java @@ -1,9 +1,9 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static com.google.common.base.Charsets.UTF_8; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC; -import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER; -import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC; +import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER; +import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD; import static io.netty.handler.codec.http2.Http2CodecUtil.toByteBuf; import static io.netty.handler.codec.http2.Http2Exception.protocolError; import static org.junit.Assert.assertArrayEquals; @@ -20,19 +20,11 @@ import com.google.common.io.ByteStreams; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; import com.google.net.stubby.Status.Code; -import com.google.net.stubby.newtransport.Framer; -import com.google.net.stubby.newtransport.MessageFramer; -import com.google.net.stubby.newtransport.ServerStream; -import com.google.net.stubby.newtransport.ServerStreamListener; -import com.google.net.stubby.newtransport.ServerTransportListener; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import com.google.net.stubby.transport.Framer; +import com.google.net.stubby.transport.MessageFramer; +import com.google.net.stubby.transport.ServerStream; +import com.google.net.stubby.transport.ServerStreamListener; +import com.google.net.stubby.transport.ServerTransportListener; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -54,6 +46,14 @@ import io.netty.handler.codec.http2.Http2Headers; import io.netty.handler.codec.http2.Http2OutboundFlowController; import io.netty.handler.codec.http2.Http2Settings; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java similarity index 94% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java index fac04365a5..2a1b8b8a57 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java @@ -1,7 +1,7 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame; -import static com.google.net.stubby.newtransport.netty.NettyTestUtil.statusFrame; +import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame; +import static com.google.net.stubby.transport.netty.NettyTestUtil.statusFrame; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Matchers.same; @@ -12,8 +12,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import com.google.net.stubby.Metadata; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.ServerStreamListener; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.ServerStreamListener; +import com.google.net.stubby.transport.StreamState; import io.netty.buffer.EmptyByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java similarity index 96% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java index 7fcc8c7c44..1a6d7085a2 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java @@ -1,6 +1,6 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; -import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame; +import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame; import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.DEFAULT_WINDOW_UPDATE_RATIO; import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.WINDOW_UPDATE_OFF; import static io.netty.util.CharsetUtil.UTF_8; @@ -15,15 +15,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.util.concurrent.SettableFuture; -import com.google.net.stubby.newtransport.StreamListener; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; +import com.google.net.stubby.transport.StreamListener; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.channel.Channel; @@ -35,6 +27,14 @@ import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; import io.netty.handler.codec.http2.DefaultHttp2InboundFlowController; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.concurrent.TimeUnit; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java similarity index 94% rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java index 2abea486d6..3095d07788 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java +++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.netty; +package com.google.net.stubby.transport.netty; import static com.google.net.stubby.GrpcFramingUtil.PAYLOAD_FRAME; import static com.google.net.stubby.GrpcFramingUtil.STATUS_FRAME; @@ -6,7 +6,7 @@ import static io.netty.util.CharsetUtil.UTF_8; import com.google.common.io.ByteStreams; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.AbstractStream; +import com.google.net.stubby.transport.AbstractStream; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java similarity index 99% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java index 2ef8ddf1c2..b798def023 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import com.google.common.util.concurrent.SettableFuture; import com.google.net.stubby.SerializingExecutor; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java similarity index 96% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java index d00b040d4d..37becb8e85 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java @@ -1,9 +1,9 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.net.stubby.Metadata; -import com.google.net.stubby.newtransport.HttpUtil; +import com.google.net.stubby.transport.HttpUtil; import com.squareup.okhttp.internal.spdy.Header; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java similarity index 89% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java index 25dfd48772..313fa9bd97 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java @@ -1,7 +1,7 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; -import com.google.net.stubby.newtransport.AbstractBuffer; -import com.google.net.stubby.newtransport.Buffer; +import com.google.net.stubby.transport.AbstractBuffer; +import com.google.net.stubby.transport.Buffer; import java.io.EOFException; import java.io.IOException; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java similarity index 97% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java index 88db196ee6..57a831e771 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -7,14 +7,14 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.net.stubby.Metadata; import com.google.net.stubby.MethodDescriptor; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.AbstractClientStream; -import com.google.net.stubby.newtransport.AbstractClientTransport; -import com.google.net.stubby.newtransport.Buffers; -import com.google.net.stubby.newtransport.ClientStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.ClientTransport; -import com.google.net.stubby.newtransport.MessageDeframer2; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.AbstractClientStream; +import com.google.net.stubby.transport.AbstractClientTransport; +import com.google.net.stubby.transport.Buffers; +import com.google.net.stubby.transport.ClientStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.ClientTransport; +import com.google.net.stubby.transport.MessageDeframer2; +import com.google.net.stubby.transport.StreamState; import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.spdy.FrameReader; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java similarity index 80% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java index 7ed6a368fb..a142da02c8 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java @@ -1,8 +1,8 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import com.google.common.base.Preconditions; -import com.google.net.stubby.newtransport.ClientTransport; -import com.google.net.stubby.newtransport.ClientTransportFactory; +import com.google.net.stubby.transport.ClientTransport; +import com.google.net.stubby.transport.ClientTransportFactory; import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java similarity index 94% rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java index f5b67eeb20..d5bd2258de 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import com.google.net.stubby.Metadata; diff --git a/core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java similarity index 97% rename from core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java rename to okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java index f35096c79f..3cb0a04db9 100644 --- a/core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java +++ b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java @@ -1,4 +1,4 @@ -package com.google.net.stubby.newtransport.okhttp; +package com.google.net.stubby.transport.okhttp; import static com.google.common.base.Charsets.UTF_8; import static org.junit.Assert.assertEquals; @@ -20,10 +20,10 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.net.stubby.Metadata; import com.google.net.stubby.MethodDescriptor; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.AbstractStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransport.ClientFrameHandler; -import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransport.OkHttpClientStream; +import com.google.net.stubby.transport.AbstractStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.okhttp.OkHttpClientTransport.ClientFrameHandler; +import com.google.net.stubby.transport.okhttp.OkHttpClientTransport.OkHttpClientStream; import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.spdy.FrameReader; diff --git a/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java b/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java index 1e452c8dd5..962cce8f06 100644 --- a/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java +++ b/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java @@ -8,11 +8,11 @@ import com.google.net.stubby.SerializingExecutor; import com.google.net.stubby.ServerCall; import com.google.net.stubby.ServerMethodDefinition; import com.google.net.stubby.Status; -import com.google.net.stubby.newtransport.ClientStream; -import com.google.net.stubby.newtransport.ClientStreamListener; -import com.google.net.stubby.newtransport.ClientTransport; -import com.google.net.stubby.newtransport.ClientTransportFactory; -import com.google.net.stubby.newtransport.StreamState; +import com.google.net.stubby.transport.ClientStream; +import com.google.net.stubby.transport.ClientStreamListener; +import com.google.net.stubby.transport.ClientTransport; +import com.google.net.stubby.transport.ClientTransportFactory; +import com.google.net.stubby.transport.StreamState; import java.io.IOException; import java.io.InputStream;