From e376888d486bf9111ada3895ea5221cf4f2b8f2b Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 9 Jun 2012 21:05:59 +0900 Subject: [PATCH] Replace 'Stream' with 'Byte' - In computing, 'stream' means both byte stream and message stream, which is confusing. - Also, we were already mixing stream and byte in some places and it's better use the terms consistently. (e.g. inboundByteBuffer & inbound stream) --- .../codec/http/HttpContentCompressor.java | 4 +-- .../codec/http/HttpContentDecoder.java | 6 ++--- .../codec/http/HttpContentDecompressor.java | 8 +++--- .../codec/http/HttpContentEncoder.java | 10 +++---- .../codec/http/HttpMessageEncoder.java | 4 +-- .../websocketx/WebSocket00FrameEncoder.java | 4 +-- .../websocketx/WebSocket08FrameEncoder.java | 4 +-- .../handler/codec/spdy/SpdyFrameDecoder.java | 4 +-- .../handler/codec/spdy/SpdyFrameEncoder.java | 4 +-- .../codec/http/HttpClientCodecTest.java | 10 +++---- ...oStreamCodec.java => ByteToByteCodec.java} | 10 +++---- ...eamDecoder.java => ByteToByteDecoder.java} | 4 +-- ...eamEncoder.java => ByteToByteEncoder.java} | 4 +-- ...sageCodec.java => ByteToMessageCodec.java} | 14 +++++----- ...Decoder.java => ByteToMessageDecoder.java} | 4 +-- .../codec/DelimiterBasedFrameDecoder.java | 2 +- .../codec/FixedLengthFrameDecoder.java | 2 +- .../codec/LengthFieldBasedFrameDecoder.java | 2 +- .../handler/codec/LengthFieldPrepender.java | 2 +- ...Encoder.java => MessageToByteEncoder.java} | 2 +- .../netty/handler/codec/ReplayingDecoder.java | 4 +-- .../handler/codec/base64/Base64Decoder.java | 4 +-- .../codec/compression/ZlibDecoder.java | 4 +-- .../codec/compression/ZlibEncoder.java | 4 +-- .../CompatibleMarshallingEncoder.java | 6 ++--- .../codec/marshalling/MarshallingEncoder.java | 6 ++--- .../ProtobufVarint32FrameDecoder.java | 4 +-- .../ProtobufVarint32LengthFieldPrepender.java | 4 +-- .../CompatibleObjectEncoder.java | 4 +-- .../codec/serialization/ObjectEncoder.java | 4 +-- .../handler/codec/ReplayingDecoderTest.java | 4 +-- .../frame/DelimiterBasedFrameDecoderTest.java | 6 ++--- .../LengthFieldBasedFrameDecoderTest.java | 6 ++--- ...tractCompatibleMarshallingDecoderTest.java | 8 +++--- ...tractCompatibleMarshallingEncoderTest.java | 4 +-- .../ProtobufVarint32FrameDecoderTest.java | 6 ++--- ...tobufVarint32LengthFieldPrependerTest.java | 6 ++--- .../example/discard/DiscardClientHandler.java | 4 +-- .../example/discard/DiscardServerHandler.java | 4 +-- .../netty/example/echo/EchoClientHandler.java | 4 +-- .../netty/example/echo/EchoServerHandler.java | 4 +-- .../example/factorial/BigIntegerDecoder.java | 4 +-- .../example/factorial/NumberEncoder.java | 4 +-- .../PortUnificationServerHandler.java | 4 +-- .../proxy/HexDumpProxyBackendHandler.java | 4 +-- .../proxy/HexDumpProxyFrontendHandler.java | 4 +-- .../example/uptime/UptimeClientHandler.java | 4 +-- ...ngHandler.java => ByteLoggingHandler.java} | 14 +++++----- .../transport/socket/SocketEchoTest.java | 4 +-- .../transport/socket/SocketSpdyEchoTest.java | 4 +-- .../transport/socket/SocketSslEchoTest.java | 4 +-- .../io/netty/channel/ChannelBufferHolder.java | 8 +++--- .../io/netty/channel/ChannelBufferType.java | 2 +- ... => ChannelInboundByteHandlerAdapter.java} | 2 +- ...=> ChannelOutboundByteHandlerAdapter.java} | 2 +- .../channel/DefaultChannelHandlerContext.java | 26 +++++++++---------- .../netty/channel/DefaultChannelPipeline.java | 10 +++---- .../embedded/AbstractEmbeddedChannel.java | 4 +-- ...mChannel.java => EmbeddedByteChannel.java} | 6 ++--- ...annel.java => AbstractNioByteChannel.java} | 10 +++---- .../channel/socket/nio/NioSocketChannel.java | 2 +- ...annel.java => AbstractOioByteChannel.java} | 10 +++---- .../channel/socket/oio/OioSocketChannel.java | 2 +- 63 files changed, 169 insertions(+), 169 deletions(-) rename codec/src/main/java/io/netty/handler/codec/{StreamToStreamCodec.java => ByteToByteCodec.java} (88%) rename codec/src/main/java/io/netty/handler/codec/{StreamToStreamDecoder.java => ByteToByteDecoder.java} (94%) rename codec/src/main/java/io/netty/handler/codec/{StreamToStreamEncoder.java => ByteToByteEncoder.java} (92%) rename codec/src/main/java/io/netty/handler/codec/{StreamToMessageCodec.java => ByteToMessageCodec.java} (84%) rename codec/src/main/java/io/netty/handler/codec/{StreamToMessageDecoder.java => ByteToMessageDecoder.java} (96%) rename codec/src/main/java/io/netty/handler/codec/{MessageToStreamEncoder.java => MessageToByteEncoder.java} (95%) rename handler/src/main/java/io/netty/handler/logging/{StreamLoggingHandler.java => ByteLoggingHandler.java} (95%) rename transport/src/main/java/io/netty/channel/{ChannelInboundStreamHandlerAdapter.java => ChannelInboundByteHandlerAdapter.java} (92%) rename transport/src/main/java/io/netty/channel/{ChannelOutboundStreamHandlerAdapter.java => ChannelOutboundByteHandlerAdapter.java} (89%) rename transport/src/main/java/io/netty/channel/embedded/{EmbeddedStreamChannel.java => EmbeddedByteChannel.java} (93%) rename transport/src/main/java/io/netty/channel/socket/nio/{AbstractNioStreamChannel.java => AbstractNioByteChannel.java} (93%) rename transport/src/main/java/io/netty/channel/socket/oio/{AbstractOioStreamChannel.java => AbstractOioByteChannel.java} (91%) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java index 71c3bf3535..425c47d018 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java @@ -15,7 +15,7 @@ */ package io.netty.handler.codec.http; -import io.netty.channel.embedded.EmbeddedStreamChannel; +import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.handler.codec.compression.ZlibEncoder; import io.netty.handler.codec.compression.ZlibWrapper; @@ -118,7 +118,7 @@ public class HttpContentCompressor extends HttpContentEncoder { return new Result( targetContentEncoding, - new EmbeddedStreamChannel( + new EmbeddedByteChannel( new ZlibEncoder(wrapper, compressionLevel, windowBits, memLevel))); } diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java index 9b1c18b6f5..416328c5e7 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java @@ -18,7 +18,7 @@ package io.netty.handler.codec.http; import io.netty.buffer.ChannelBuffer; import io.netty.buffer.ChannelBuffers; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.embedded.EmbeddedStreamChannel; +import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.handler.codec.MessageToMessageDecoder; /** @@ -42,7 +42,7 @@ import io.netty.handler.codec.MessageToMessageDecoder; */ public abstract class HttpContentDecoder extends MessageToMessageDecoder { - private EmbeddedStreamChannel decoder; + private EmbeddedByteChannel decoder; /** * Creates a new instance. @@ -137,7 +137,7 @@ public abstract class HttpContentDecoder extends MessageToMessageDecoder { private final Queue acceptEncodingQueue = QueueFactory.createQueue(); - private EmbeddedStreamChannel encoder; + private EmbeddedByteChannel encoder; /** * Creates a new instance. @@ -200,9 +200,9 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec { +public abstract class HttpMessageEncoder extends MessageToByteEncoder { private static final ChannelBuffer LAST_CHUNK = copiedBuffer("0\r\n\r\n", CharsetUtil.US_ASCII); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java index bba40d933b..23c0d2586a 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java @@ -18,7 +18,7 @@ package io.netty.handler.codec.http.websocketx; import io.netty.buffer.ChannelBuffer; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToStreamEncoder; +import io.netty.handler.codec.MessageToByteEncoder; /** * Encodes a {@link WebSocketFrame} into a {@link ChannelBuffer}. @@ -30,7 +30,7 @@ import io.netty.handler.codec.MessageToStreamEncoder; * @apiviz.uses io.netty.handler.codec.http.websocket.WebSocketFrame */ @Sharable -public class WebSocket00FrameEncoder extends MessageToStreamEncoder { +public class WebSocket00FrameEncoder extends MessageToByteEncoder { @Override public boolean isEncodable(Object msg) throws Exception { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java index 9d621b0e35..37a993d264 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java @@ -56,7 +56,7 @@ package io.netty.handler.codec.http.websocketx; import io.netty.buffer.ChannelBuffer; import io.netty.buffer.ChannelBuffers; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToStreamEncoder; +import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.TooLongFrameException; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; @@ -69,7 +69,7 @@ import java.nio.ByteBuffer; * href="https://github.com/joewalnes/webbit">webbit and modified. *

*/ -public class WebSocket08FrameEncoder extends MessageToStreamEncoder { +public class WebSocket08FrameEncoder extends MessageToByteEncoder { private static final InternalLogger logger = InternalLoggerFactory.getInstance(WebSocket08FrameEncoder.class); diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java index 245ecda0e9..d21f7c9fd0 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java @@ -19,13 +19,13 @@ import static io.netty.handler.codec.spdy.SpdyCodecUtil.*; import io.netty.buffer.ChannelBuffer; import io.netty.buffer.ChannelBuffers; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.StreamToMessageDecoder; +import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.TooLongFrameException; /** * Decodes {@link ChannelBuffer}s into SPDY Data and Control Frames. */ -public class SpdyFrameDecoder extends StreamToMessageDecoder { +public class SpdyFrameDecoder extends ByteToMessageDecoder { private final int spdyVersion; private final int maxChunkSize; diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java index 693a9231b1..50f96a394f 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java @@ -21,7 +21,7 @@ import io.netty.buffer.ChannelBuffers; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToStreamEncoder; +import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.UnsupportedMessageTypeException; import java.nio.ByteOrder; @@ -30,7 +30,7 @@ import java.util.Set; /** * Encodes a SPDY Data or Control Frame into a {@link ChannelBuffer}. */ -public class SpdyFrameEncoder extends MessageToStreamEncoder { +public class SpdyFrameEncoder extends MessageToByteEncoder { private final int version; private volatile boolean finished; diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java index 48ed008ef8..855e9c162f 100644 --- a/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java +++ b/codec-http/src/test/java/io/netty/handler/codec/http/HttpClientCodecTest.java @@ -17,7 +17,7 @@ package io.netty.handler.codec.http; import static org.junit.Assert.*; import io.netty.buffer.ChannelBuffers; -import io.netty.channel.embedded.EmbeddedStreamChannel; +import io.netty.channel.embedded.EmbeddedByteChannel; import io.netty.handler.codec.CodecException; import io.netty.handler.codec.PrematureChannelClosureException; import io.netty.util.CharsetUtil; @@ -36,7 +36,7 @@ public class HttpClientCodecTest { @Test public void testFailsNotOnRequestResponse() { HttpClientCodec codec = new HttpClientCodec(4096, 8192, 8192, true); - EmbeddedStreamChannel ch = new EmbeddedStreamChannel(codec); + EmbeddedByteChannel ch = new EmbeddedByteChannel(codec); ch.writeOutbound(new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost/")); ch.writeInbound(ChannelBuffers.copiedBuffer(RESPONSE, CharsetUtil.ISO_8859_1)); @@ -46,7 +46,7 @@ public class HttpClientCodecTest { @Test public void testFailsNotOnRequestResponseChunked() { HttpClientCodec codec = new HttpClientCodec(4096, 8192, 8192, true); - EmbeddedStreamChannel ch = new EmbeddedStreamChannel(codec); + EmbeddedByteChannel ch = new EmbeddedByteChannel(codec); ch.writeOutbound(new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost/")); ch.writeInbound(ChannelBuffers.copiedBuffer(CHUNKED_RESPONSE, CharsetUtil.ISO_8859_1)); @@ -56,7 +56,7 @@ public class HttpClientCodecTest { @Test public void testFailsOnMissingResponse() { HttpClientCodec codec = new HttpClientCodec(4096, 8192, 8192, true); - EmbeddedStreamChannel ch = new EmbeddedStreamChannel(codec); + EmbeddedByteChannel ch = new EmbeddedByteChannel(codec); assertTrue(ch.writeOutbound(new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost/"))); assertNotNull(ch.readOutbound()); @@ -73,7 +73,7 @@ public class HttpClientCodecTest { @Test public void testFailsOnIncompleteChunkedResponse() { HttpClientCodec codec = new HttpClientCodec(4096, 8192, 8192, true); - EmbeddedStreamChannel ch = new EmbeddedStreamChannel(codec); + EmbeddedByteChannel ch = new EmbeddedByteChannel(codec); ch.writeOutbound(new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost/")); ch.writeInbound(ChannelBuffers.copiedBuffer(INCOMPLETE_CHUNKED_RESPONSE, CharsetUtil.ISO_8859_1)); diff --git a/codec/src/main/java/io/netty/handler/codec/StreamToStreamCodec.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java similarity index 88% rename from codec/src/main/java/io/netty/handler/codec/StreamToStreamCodec.java rename to codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java index 30f6224ea1..6a0f1a7685 100644 --- a/codec/src/main/java/io/netty/handler/codec/StreamToStreamCodec.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteCodec.java @@ -23,25 +23,25 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandler; import io.netty.channel.ChannelOutboundHandler; -public abstract class StreamToStreamCodec +public abstract class ByteToByteCodec extends ChannelHandlerAdapter implements ChannelInboundHandler, ChannelOutboundHandler { - private final StreamToStreamEncoder encoder = new StreamToStreamEncoder() { + private final ByteToByteEncoder encoder = new ByteToByteEncoder() { @Override public void encode( ChannelHandlerContext ctx, ChannelBuffer in, ChannelBuffer out) throws Exception { - StreamToStreamCodec.this.encode(ctx, in, out); + ByteToByteCodec.this.encode(ctx, in, out); } }; - private final StreamToStreamDecoder decoder = new StreamToStreamDecoder() { + private final ByteToByteDecoder decoder = new ByteToByteDecoder() { @Override public void decode( ChannelHandlerContext ctx, ChannelBuffer in, ChannelBuffer out) throws Exception { - StreamToStreamCodec.this.decode(ctx, in, out); + ByteToByteCodec.this.decode(ctx, in, out); } }; diff --git a/codec/src/main/java/io/netty/handler/codec/StreamToStreamDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java similarity index 94% rename from codec/src/main/java/io/netty/handler/codec/StreamToStreamDecoder.java rename to codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java index 0226dfe277..9d0e8cc8bf 100644 --- a/codec/src/main/java/io/netty/handler/codec/StreamToStreamDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteDecoder.java @@ -17,9 +17,9 @@ package io.netty.handler.codec; import io.netty.buffer.ChannelBuffer; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundStreamHandlerAdapter; +import io.netty.channel.ChannelInboundByteHandlerAdapter; -public abstract class StreamToStreamDecoder extends ChannelInboundStreamHandlerAdapter { +public abstract class ByteToByteDecoder extends ChannelInboundByteHandlerAdapter { @Override public void inboundBufferUpdated(ChannelHandlerContext ctx) throws Exception { diff --git a/codec/src/main/java/io/netty/handler/codec/StreamToStreamEncoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java similarity index 92% rename from codec/src/main/java/io/netty/handler/codec/StreamToStreamEncoder.java rename to codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java index eb864f634b..13e9c05089 100644 --- a/codec/src/main/java/io/netty/handler/codec/StreamToStreamEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToByteEncoder.java @@ -18,9 +18,9 @@ package io.netty.handler.codec; import io.netty.buffer.ChannelBuffer; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOutboundStreamHandlerAdapter; +import io.netty.channel.ChannelOutboundByteHandlerAdapter; -public abstract class StreamToStreamEncoder extends ChannelOutboundStreamHandlerAdapter { +public abstract class ByteToByteEncoder extends ChannelOutboundByteHandlerAdapter { @Override public void flush(ChannelHandlerContext ctx, ChannelFuture future) throws Exception { diff --git a/codec/src/main/java/io/netty/handler/codec/StreamToMessageCodec.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java similarity index 84% rename from codec/src/main/java/io/netty/handler/codec/StreamToMessageCodec.java rename to codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java index f1cecaaf13..c8594d8702 100644 --- a/codec/src/main/java/io/netty/handler/codec/StreamToMessageCodec.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java @@ -23,26 +23,26 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandler; import io.netty.channel.ChannelOutboundHandler; -public abstract class StreamToMessageCodec +public abstract class ByteToMessageCodec extends ChannelHandlerAdapter implements ChannelInboundHandler, ChannelOutboundHandler { - private final MessageToStreamEncoder encoder = - new MessageToStreamEncoder() { + private final MessageToByteEncoder encoder = + new MessageToByteEncoder() { @Override public void encode( ChannelHandlerContext ctx, OUTBOUND_IN msg, ChannelBuffer out) throws Exception { - StreamToMessageCodec.this.encode(ctx, msg, out); + ByteToMessageCodec.this.encode(ctx, msg, out); } }; - private final StreamToMessageDecoder decoder = - new StreamToMessageDecoder() { + private final ByteToMessageDecoder decoder = + new ByteToMessageDecoder() { @Override public INBOUND_OUT decode( ChannelHandlerContext ctx, ChannelBuffer in) throws Exception { - return StreamToMessageCodec.this.decode(ctx, in); + return ByteToMessageCodec.this.decode(ctx, in); } }; diff --git a/codec/src/main/java/io/netty/handler/codec/StreamToMessageDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java similarity index 96% rename from codec/src/main/java/io/netty/handler/codec/StreamToMessageDecoder.java rename to codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java index 1a6ee16f6a..58e660e41c 100644 --- a/codec/src/main/java/io/netty/handler/codec/StreamToMessageDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java @@ -18,10 +18,10 @@ package io.netty.handler.codec; import io.netty.buffer.ChannelBuffer; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandler; -import io.netty.channel.ChannelInboundStreamHandlerAdapter; +import io.netty.channel.ChannelInboundByteHandlerAdapter; import io.netty.channel.ChannelPipeline; -public abstract class StreamToMessageDecoder extends ChannelInboundStreamHandlerAdapter { +public abstract class ByteToMessageDecoder extends ChannelInboundByteHandlerAdapter { private ChannelHandlerContext ctx; diff --git a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java index 18e429e49f..7b4e759004 100644 --- a/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/DelimiterBasedFrameDecoder.java @@ -54,7 +54,7 @@ import io.netty.channel.ChannelHandlerContext; * * @apiviz.uses io.netty.handler.codec.frame.Delimiters - - useful */ -public class DelimiterBasedFrameDecoder extends StreamToMessageDecoder { +public class DelimiterBasedFrameDecoder extends ByteToMessageDecoder { private final ChannelBuffer[] delimiters; private final int maxFrameLength; diff --git a/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java index 2f83b9d8b7..18492ce901 100644 --- a/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/FixedLengthFrameDecoder.java @@ -37,7 +37,7 @@ import io.netty.channel.ChannelHandlerContext; * +-----+-----+-----+ * */ -public class FixedLengthFrameDecoder extends StreamToMessageDecoder { +public class FixedLengthFrameDecoder extends ByteToMessageDecoder { private final int frameLength; private final boolean allocateFullBuffer; diff --git a/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java index 83e8ea295a..ecdddc0bce 100644 --- a/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java @@ -179,7 +179,7 @@ import io.netty.handler.codec.serialization.ObjectDecoder; * * @see LengthFieldPrepender */ -public class LengthFieldBasedFrameDecoder extends StreamToMessageDecoder { +public class LengthFieldBasedFrameDecoder extends ByteToMessageDecoder { private final int maxFrameLength; private final int lengthFieldOffset; diff --git a/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java index bc9666cdf0..6a72108650 100644 --- a/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java +++ b/codec/src/main/java/io/netty/handler/codec/LengthFieldPrepender.java @@ -51,7 +51,7 @@ import java.nio.ByteOrder; * */ @Sharable -public class LengthFieldPrepender extends MessageToStreamEncoder { +public class LengthFieldPrepender extends MessageToByteEncoder { private final int lengthFieldLength; private final boolean lengthIncludesLengthFieldLength; diff --git a/codec/src/main/java/io/netty/handler/codec/MessageToStreamEncoder.java b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java similarity index 95% rename from codec/src/main/java/io/netty/handler/codec/MessageToStreamEncoder.java rename to codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java index 4a7bfd4b65..9d30230a09 100644 --- a/codec/src/main/java/io/netty/handler/codec/MessageToStreamEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java @@ -22,7 +22,7 @@ import io.netty.channel.ChannelOutboundMessageHandlerAdapter; import java.util.Queue; -public abstract class MessageToStreamEncoder extends ChannelOutboundMessageHandlerAdapter { +public abstract class MessageToByteEncoder extends ChannelOutboundMessageHandlerAdapter { @Override public void flush(ChannelHandlerContext ctx, ChannelFuture future) throws Exception { diff --git a/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java b/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java index 2cafbbb96c..8bfce15f82 100644 --- a/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java +++ b/codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java @@ -26,7 +26,7 @@ import io.netty.util.Signal; import io.netty.util.VoidEnum; /** - * A specialized variation of {@link StreamToMessageDecoder} which enables implementation + * A specialized variation of {@link ByteToMessageDecoder} which enables implementation * of a non-blocking decoder in the blocking I/O paradigm. *

* The biggest difference between {@link ReplayingDecoder} and @@ -278,7 +278,7 @@ import io.netty.util.VoidEnum; * @apiviz.landmark * @apiviz.has io.netty.handler.codec.UnreplayableOperationException oneway - - throws */ -public abstract class ReplayingDecoder> extends StreamToMessageDecoder { +public abstract class ReplayingDecoder> extends ByteToMessageDecoder { static final Signal REPLAY = new Signal(ReplayingDecoder.class.getName() + ".REPLAY"); diff --git a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java index 9e630ea7d5..2d5b28cadd 100644 --- a/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java +++ b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java @@ -19,15 +19,15 @@ import io.netty.buffer.ChannelBuffer; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; +import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.DelimiterBasedFrameDecoder; import io.netty.handler.codec.Delimiters; import io.netty.handler.codec.MessageToMessageDecoder; -import io.netty.handler.codec.StreamToMessageDecoder; /** * Decodes a Base64-encoded {@link ChannelBuffer} or US-ASCII {@link String} * into a {@link ChannelBuffer}. Please note that this decoder must be used - * with a proper {@link StreamToMessageDecoder} such as {@link DelimiterBasedFrameDecoder} + * with a proper {@link ByteToMessageDecoder} such as {@link DelimiterBasedFrameDecoder} * if you are using a stream-based transport such as TCP/IP. A typical decoder * setup for TCP/IP would be: * 

diff --git a/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
index fd0b975c8a..ecdac2e8d4 100644
--- a/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
@@ -17,7 +17,7 @@ package io.netty.handler.codec.compression;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.StreamToStreamDecoder;
+import io.netty.handler.codec.ByteToByteDecoder;
 import io.netty.util.internal.jzlib.JZlib;
 import io.netty.util.internal.jzlib.ZStream;
 
@@ -27,7 +27,7 @@ import io.netty.util.internal.jzlib.ZStream;
  * @apiviz.landmark
  * @apiviz.has io.netty.handler.codec.compression.ZlibWrapper
  */
-public class ZlibDecoder extends StreamToStreamDecoder {
+public class ZlibDecoder extends ByteToByteDecoder {
 
     private final ZStream z = new ZStream();
     private byte[] dictionary;
diff --git a/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
index f584612026..3ea8c25179 100644
--- a/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
@@ -20,7 +20,7 @@ import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.StreamToStreamEncoder;
+import io.netty.handler.codec.ByteToByteEncoder;
 import io.netty.util.internal.jzlib.JZlib;
 import io.netty.util.internal.jzlib.ZStream;
 
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @apiviz.landmark
  * @apiviz.has io.netty.handler.codec.compression.ZlibWrapper
  */
-public class ZlibEncoder extends StreamToStreamEncoder {
+public class ZlibEncoder extends ByteToByteEncoder {
 
     private static final byte[] EMPTY_ARRAY = new byte[0];
 
diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
index cf87a82a8b..bb97293723 100644
--- a/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingEncoder.java
@@ -19,12 +19,12 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import org.jboss.marshalling.Marshaller;
 
 /**
- * {@link MessageToStreamEncoder} implementation which uses JBoss Marshalling to marshal
+ * {@link MessageToByteEncoder} implementation which uses JBoss Marshalling to marshal
  * an Object.
  *
  * See JBoss Marshalling website
@@ -34,7 +34,7 @@ import org.jboss.marshalling.Marshaller;
  *
  */
 @Sharable
-public class CompatibleMarshallingEncoder extends MessageToStreamEncoder {
+public class CompatibleMarshallingEncoder extends MessageToByteEncoder {
 
     private final MarshallerProvider provider;
 
diff --git a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java
index 1424b0c661..88c3acbecd 100644
--- a/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/marshalling/MarshallingEncoder.java
@@ -18,12 +18,12 @@ package io.netty.handler.codec.marshalling;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import org.jboss.marshalling.Marshaller;
 
 /**
- * {@link MessageToStreamEncoder} implementation which uses JBoss Marshalling to marshal
+ * {@link MessageToByteEncoder} implementation which uses JBoss Marshalling to marshal
  * an Object. Be aware that this encoder is not compatible with an other client that just use
  * JBoss Marshalling as it includes the size of every {@link Object} that gets serialized in
  * front of the {@link Object} itself.
@@ -35,7 +35,7 @@ import org.jboss.marshalling.Marshaller;
  *
  */
 @Sharable
-public class MarshallingEncoder extends MessageToStreamEncoder {
+public class MarshallingEncoder extends MessageToByteEncoder {
 
     private static final byte[] LENGTH_PLACEHOLDER = new byte[4];
     private final MarshallerProvider provider;
diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
index e9f91ee028..ca3272506e 100644
--- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
@@ -18,7 +18,7 @@ package io.netty.handler.codec.protobuf;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
-import io.netty.handler.codec.StreamToMessageDecoder;
+import io.netty.handler.codec.ByteToMessageDecoder;
 
 import com.google.protobuf.CodedInputStream;
 
@@ -37,7 +37,7 @@ import com.google.protobuf.CodedInputStream;
  *
  * @see com.google.protobuf.CodedInputStream
  */
-public class ProtobufVarint32FrameDecoder extends StreamToMessageDecoder {
+public class ProtobufVarint32FrameDecoder extends ByteToMessageDecoder {
 
     // TODO maxFrameLength + safe skip + fail-fast option
     //      (just like LengthFieldBasedFrameDecoder)
diff --git a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
index 60ea95c440..ece87da8a3 100644
--- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
+++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBufferOutputStream;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import com.google.protobuf.CodedOutputStream;
 
@@ -38,7 +38,7 @@ import com.google.protobuf.CodedOutputStream;
  * @see com.google.protobuf.CodedOutputStream
  */
 @Sharable
-public class ProtobufVarint32LengthFieldPrepender extends MessageToStreamEncoder {
+public class ProtobufVarint32LengthFieldPrepender extends MessageToByteEncoder {
 
     /**
      * Creates a new instance.
diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
index d7e0998239..5a3a6574f5 100644
--- a/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
@@ -18,7 +18,7 @@ package io.netty.handler.codec.serialization;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBufferOutputStream;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 
@@ -34,7 +34,7 @@ import java.io.Serializable;
  * This encoder is interoperable with the standard Java object streams such as
  * {@link ObjectInputStream} and {@link ObjectOutputStream}.
  */
-public class CompatibleObjectEncoder extends MessageToStreamEncoder {
+public class CompatibleObjectEncoder extends MessageToByteEncoder {
 
     private static final AttributeKey OOS =
             new AttributeKey(CompatibleObjectEncoder.class.getName() + ".oos");
diff --git a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
index 472032543f..85a236aafe 100644
--- a/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBufferOutputStream;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -36,7 +36,7 @@ import java.io.Serializable;
  * @apiviz.has io.netty.handler.codec.serialization.ObjectEncoderOutputStream - - - compatible with
  */
 @Sharable
-public class ObjectEncoder extends MessageToStreamEncoder {
+public class ObjectEncoder extends MessageToByteEncoder {
     private static final byte[] LENGTH_PLACEHOLDER = new byte[4];
 
     @Override
diff --git a/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
index 71b87eb17e..2c3aad5941 100644
--- a/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/ReplayingDecoderTest.java
@@ -20,7 +20,7 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBufferIndexFinder;
 import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 import io.netty.util.VoidEnum;
 
 import org.junit.Test;
@@ -29,7 +29,7 @@ public class ReplayingDecoderTest {
 
     @Test
     public void testLineProtocol() {
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(new LineDecoder());
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(new LineDecoder());
 
         // Ordinary input
         ch.writeInbound(ChannelBuffers.wrappedBuffer(new byte[] { 'A' }));
diff --git a/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
index 09c51e8227..c814fe4320 100644
--- a/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
@@ -18,7 +18,7 @@ package io.netty.handler.codec.frame;
 import static org.junit.Assert.*;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.DelimiterBasedFrameDecoder;
 import io.netty.handler.codec.Delimiters;
@@ -32,7 +32,7 @@ public class DelimiterBasedFrameDecoderTest {
 
     @Test
     public void testFailSlowTooLongFrameRecovery() throws Exception {
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(
                 new DelimiterBasedFrameDecoder(1, true, false, Delimiters.nulDelimiter()));
 
         for (int i = 0; i < 2; i ++) {
@@ -52,7 +52,7 @@ public class DelimiterBasedFrameDecoderTest {
 
     @Test
     public void testFailFastTooLongFrameRecovery() throws Exception {
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(
                 new DelimiterBasedFrameDecoder(1, Delimiters.nulDelimiter()));
 
         for (int i = 0; i < 2; i ++) {
diff --git a/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
index 8b20b44178..e7b8fb7c1f 100644
--- a/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
@@ -18,7 +18,7 @@ package io.netty.handler.codec.frame;
 import static org.junit.Assert.*;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.codec.TooLongFrameException;
@@ -30,7 +30,7 @@ import org.junit.Test;
 public class LengthFieldBasedFrameDecoderTest {
     @Test
     public void testFailSlowTooLongFrameRecovery() throws Exception {
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(
                 new LengthFieldBasedFrameDecoder(5, 0, 4, 0, 4, false));
 
         for (int i = 0; i < 2; i ++) {
@@ -50,7 +50,7 @@ public class LengthFieldBasedFrameDecoderTest {
 
     @Test
     public void testFailFastTooLongFrameRecovery() throws Exception {
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(
                 new LengthFieldBasedFrameDecoder(5, 0, 4, 0, 4));
 
         for (int i = 0; i < 2; i ++) {
diff --git a/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingDecoderTest.java
index 3e1a5b70b6..16318eb496 100644
--- a/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingDecoderTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.*;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 import io.netty.handler.codec.CodecException;
 import io.netty.handler.codec.TooLongFrameException;
 
@@ -42,7 +42,7 @@ public abstract class AbstractCompatibleMarshallingDecoderTest {
         MarshallerFactory marshallerFactory = createMarshallerFactory();
         MarshallingConfiguration configuration = createMarshallingConfig();
 
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(createDecoder(Integer.MAX_VALUE));
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(createDecoder(Integer.MAX_VALUE));
 
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         Marshaller marshaller = marshallerFactory.createMarshaller(configuration);
@@ -72,7 +72,7 @@ public abstract class AbstractCompatibleMarshallingDecoderTest {
         MarshallerFactory marshallerFactory = createMarshallerFactory();
         MarshallingConfiguration configuration = createMarshallingConfig();
 
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(createDecoder(Integer.MAX_VALUE));
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(createDecoder(Integer.MAX_VALUE));
 
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         Marshaller marshaller = marshallerFactory.createMarshaller(configuration);
@@ -103,7 +103,7 @@ public abstract class AbstractCompatibleMarshallingDecoderTest {
         MarshallingConfiguration configuration = createMarshallingConfig();
 
         ChannelHandler mDecoder = createDecoder(4);
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(mDecoder);
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(mDecoder);
 
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         Marshaller marshaller = marshallerFactory.createMarshaller(configuration);
diff --git a/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingEncoderTest.java
index fff310933b..b308654370 100644
--- a/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingEncoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/marshalling/AbstractCompatibleMarshallingEncoderTest.java
@@ -17,7 +17,7 @@ package io.netty.handler.codec.marshalling;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 
 import java.io.IOException;
 
@@ -38,7 +38,7 @@ public abstract class AbstractCompatibleMarshallingEncoderTest {
         final MarshallerFactory marshallerFactory = createMarshallerFactory();
         final MarshallingConfiguration configuration = createMarshallingConfig();
 
-        EmbeddedStreamChannel ch = new EmbeddedStreamChannel(createEncoder());
+        EmbeddedByteChannel ch = new EmbeddedByteChannel(createEncoder());
 
         ch.writeOutbound(testObject);
         Assert.assertTrue(ch.finish());
diff --git a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
index 93e503b979..88016f6e8f 100644
--- a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
@@ -20,18 +20,18 @@ import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsNull.*;
 import static org.junit.Assert.*;
 import io.netty.buffer.ChannelBuffer;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 
 import org.junit.Before;
 import org.junit.Test;
 
 public class ProtobufVarint32FrameDecoderTest {
 
-    private EmbeddedStreamChannel ch;
+    private EmbeddedByteChannel ch;
 
     @Before
     public void setUp() {
-        ch = new EmbeddedStreamChannel(new ProtobufVarint32FrameDecoder());
+        ch = new EmbeddedByteChannel(new ProtobufVarint32FrameDecoder());
     }
 
     @Test
diff --git a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
index 2e714fc455..4288f2dbe9 100644
--- a/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
+++ b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
@@ -18,18 +18,18 @@ package io.netty.handler.codec.protobuf;
 import static io.netty.buffer.ChannelBuffers.*;
 import static org.hamcrest.core.Is.*;
 import static org.junit.Assert.*;
-import io.netty.channel.embedded.EmbeddedStreamChannel;
+import io.netty.channel.embedded.EmbeddedByteChannel;
 
 import org.junit.Before;
 import org.junit.Test;
 
 public class ProtobufVarint32LengthFieldPrependerTest {
 
-    private EmbeddedStreamChannel ch;
+    private EmbeddedByteChannel ch;
 
     @Before
     public void setUp() {
-        ch = new EmbeddedStreamChannel(new ProtobufVarint32LengthFieldPrepender());
+        ch = new EmbeddedByteChannel(new ProtobufVarint32LengthFieldPrepender());
     }
 
     @Test
diff --git a/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
index c7d3ce4278..bc4d9953f4 100644
--- a/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
+++ b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 /**
  * Handles a client-side channel.
  */
-public class DiscardClientHandler extends ChannelInboundStreamHandlerAdapter {
+public class DiscardClientHandler extends ChannelInboundByteHandlerAdapter {
 
     private static final Logger logger = Logger.getLogger(
             DiscardClientHandler.class.getName());
diff --git a/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
index 27000f3ca4..96ebb19cc0 100644
--- a/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
+++ b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
@@ -17,7 +17,7 @@ package io.netty.example.discard;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
 /**
  * Handles a server-side channel.
  */
-public class DiscardServerHandler extends ChannelInboundStreamHandlerAdapter {
+public class DiscardServerHandler extends ChannelInboundByteHandlerAdapter {
 
     private static final Logger logger = Logger.getLogger(
             DiscardServerHandler.class.getName());
diff --git a/example/src/main/java/io/netty/example/echo/EchoClientHandler.java b/example/src/main/java/io/netty/example/echo/EchoClientHandler.java
index ebb8970707..1c5a947af2 100644
--- a/example/src/main/java/io/netty/example/echo/EchoClientHandler.java
+++ b/example/src/main/java/io/netty/example/echo/EchoClientHandler.java
@@ -18,7 +18,7 @@ package io.netty.example.echo;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
  * traffic between the echo client and server by sending the first message to
  * the server.
  */
-public class EchoClientHandler extends ChannelInboundStreamHandlerAdapter {
+public class EchoClientHandler extends ChannelInboundByteHandlerAdapter {
 
     private static final Logger logger = Logger.getLogger(
             EchoClientHandler.class.getName());
diff --git a/example/src/main/java/io/netty/example/echo/EchoServerHandler.java b/example/src/main/java/io/netty/example/echo/EchoServerHandler.java
index c9b89dd80c..1b2c5e3f3f 100644
--- a/example/src/main/java/io/netty/example/echo/EchoServerHandler.java
+++ b/example/src/main/java/io/netty/example/echo/EchoServerHandler.java
@@ -18,7 +18,7 @@ package io.netty.example.echo;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
  * Handler implementation for the echo server.
  */
 @Sharable
-public class EchoServerHandler extends ChannelInboundStreamHandlerAdapter {
+public class EchoServerHandler extends ChannelInboundByteHandlerAdapter {
 
     private static final Logger logger = Logger.getLogger(
             EchoServerHandler.class.getName());
diff --git a/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java b/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
index a5008ffd33..9a5e5788f0 100644
--- a/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
+++ b/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
@@ -18,7 +18,7 @@ package io.netty.example.factorial;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
-import io.netty.handler.codec.StreamToMessageDecoder;
+import io.netty.handler.codec.ByteToMessageDecoder;
 
 import java.math.BigInteger;
 
@@ -28,7 +28,7 @@ import java.math.BigInteger;
  * {@link BigInteger} instance.  For example, { 'F', 0, 0, 0, 1, 42 } will be
  * decoded into new BigInteger("42").
  */
-public class BigIntegerDecoder extends StreamToMessageDecoder {
+public class BigIntegerDecoder extends ByteToMessageDecoder {
 
     @Override
     public BigInteger decode(ChannelHandlerContext ctx, ChannelBuffer in) {
diff --git a/example/src/main/java/io/netty/example/factorial/NumberEncoder.java b/example/src/main/java/io/netty/example/factorial/NumberEncoder.java
index 7eb63c05f1..20c6f1df11 100644
--- a/example/src/main/java/io/netty/example/factorial/NumberEncoder.java
+++ b/example/src/main/java/io/netty/example/factorial/NumberEncoder.java
@@ -17,7 +17,7 @@ package io.netty.example.factorial;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToStreamEncoder;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import java.math.BigInteger;
 
@@ -26,7 +26,7 @@ import java.math.BigInteger;
  * a magic number ('F' or 0x46) and a 32-bit length prefix.  For example, 42
  * will be encoded to { 'F', 0, 0, 0, 1, 42 }.
  */
-public class NumberEncoder extends MessageToStreamEncoder {
+public class NumberEncoder extends MessageToByteEncoder {
 
     @Override
     public void encode(
diff --git a/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java b/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
index 2cd0e20174..842ef52a11 100644
--- a/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
+++ b/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
@@ -17,7 +17,7 @@ package io.netty.example.portunification;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelPipeline;
 import io.netty.example.factorial.BigIntegerDecoder;
 import io.netty.example.factorial.FactorialServerHandler;
@@ -38,7 +38,7 @@ import javax.net.ssl.SSLEngine;
  * Manipulates the current pipeline dynamically to switch protocols or enable
  * SSL or GZIP.
  */
-public class PortUnificationServerHandler extends ChannelInboundStreamHandlerAdapter {
+public class PortUnificationServerHandler extends ChannelInboundByteHandlerAdapter {
 
     private final boolean detectSsl;
     private final boolean detectGzip;
diff --git a/example/src/main/java/io/netty/example/proxy/HexDumpProxyBackendHandler.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyBackendHandler.java
index dabcc2aeca..59ea1ec605 100644
--- a/example/src/main/java/io/netty/example/proxy/HexDumpProxyBackendHandler.java
+++ b/example/src/main/java/io/netty/example/proxy/HexDumpProxyBackendHandler.java
@@ -18,9 +18,9 @@ package io.netty.example.proxy;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
-public class HexDumpProxyBackendHandler extends ChannelInboundStreamHandlerAdapter {
+public class HexDumpProxyBackendHandler extends ChannelInboundByteHandlerAdapter {
 
     private final Channel inboundChannel;
 
diff --git a/example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java
index 90a8d369ad..a26110ef7e 100644
--- a/example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java
+++ b/example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java
@@ -21,10 +21,10 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.socket.nio.NioSocketChannel;
 
-public class HexDumpProxyFrontendHandler extends ChannelInboundStreamHandlerAdapter {
+public class HexDumpProxyFrontendHandler extends ChannelInboundByteHandlerAdapter {
 
     private final String remoteHost;
     private final int remotePort;
diff --git a/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java
index 52ed5cef45..49174bf021 100644
--- a/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java
+++ b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java
@@ -19,7 +19,7 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.EventLoop;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
  * connection attempt status.
  */
 @Sharable
-public class UptimeClientHandler extends ChannelInboundStreamHandlerAdapter {
+public class UptimeClientHandler extends ChannelInboundByteHandlerAdapter {
 
     private final UptimeClient client;
     private long startTime = -1;
diff --git a/handler/src/main/java/io/netty/handler/logging/StreamLoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/ByteLoggingHandler.java
similarity index 95%
rename from handler/src/main/java/io/netty/handler/logging/StreamLoggingHandler.java
rename to handler/src/main/java/io/netty/handler/logging/ByteLoggingHandler.java
index 30df2f0cfc..f906dbfb0a 100644
--- a/handler/src/main/java/io/netty/handler/logging/StreamLoggingHandler.java
+++ b/handler/src/main/java/io/netty/handler/logging/ByteLoggingHandler.java
@@ -23,7 +23,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandler;
 import io.netty.channel.ChannelOutboundHandler;
 
-public class StreamLoggingHandler
+public class ByteLoggingHandler
         extends LoggingHandler
         implements ChannelInboundHandler, ChannelOutboundHandler {
 
@@ -87,27 +87,27 @@ public class StreamLoggingHandler
         }
     }
 
-    public StreamLoggingHandler() {
+    public ByteLoggingHandler() {
         super();
     }
 
-    public StreamLoggingHandler(Class clazz, LogLevel level) {
+    public ByteLoggingHandler(Class clazz, LogLevel level) {
         super(clazz, level);
     }
 
-    public StreamLoggingHandler(Class clazz) {
+    public ByteLoggingHandler(Class clazz) {
         super(clazz);
     }
 
-    public StreamLoggingHandler(LogLevel level) {
+    public ByteLoggingHandler(LogLevel level) {
         super(level);
     }
 
-    public StreamLoggingHandler(String name, LogLevel level) {
+    public ByteLoggingHandler(String name, LogLevel level) {
         super(name, level);
     }
 
-    public StreamLoggingHandler(String name) {
+    public ByteLoggingHandler(String name) {
         super(name);
     }
     @Override
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
index 00cf45a5ce..bc4db46324 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
@@ -22,7 +22,7 @@ import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 
 import java.io.IOException;
 import java.util.Random;
@@ -108,7 +108,7 @@ public class SocketEchoTest extends AbstractSocketTest {
         }
     }
 
-    private static class EchoHandler extends ChannelInboundStreamHandlerAdapter {
+    private static class EchoHandler extends ChannelInboundByteHandlerAdapter {
         volatile Channel channel;
         final AtomicReference exception = new AtomicReference();
         volatile int counter;
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
index f13ad81ae0..0fc176cc5e 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
@@ -23,7 +23,7 @@ import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.spdy.SpdyConstants;
@@ -245,7 +245,7 @@ public class SocketSpdyEchoTest extends AbstractSocketTest {
         }
     }
 
-    private class SpdyEchoTestClientHandler extends ChannelInboundStreamHandlerAdapter {
+    private class SpdyEchoTestClientHandler extends ChannelInboundByteHandlerAdapter {
         final AtomicReference exception = new AtomicReference();
         final ChannelBuffer frames;
         volatile int counter;
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
index 2ee6392886..5653984266 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
@@ -23,7 +23,7 @@ import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundStreamHandlerAdapter;
+import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.ssl.SslHandler;
@@ -148,7 +148,7 @@ public class SocketSslEchoTest extends AbstractSocketTest {
         }
     }
 
-    private class EchoHandler extends ChannelInboundStreamHandlerAdapter {
+    private class EchoHandler extends ChannelInboundByteHandlerAdapter {
         volatile Channel channel;
         final AtomicReference exception = new AtomicReference();
         volatile int counter;
diff --git a/transport/src/main/java/io/netty/channel/ChannelBufferHolder.java b/transport/src/main/java/io/netty/channel/ChannelBufferHolder.java
index 2c1d342022..932a9c9491 100644
--- a/transport/src/main/java/io/netty/channel/ChannelBufferHolder.java
+++ b/transport/src/main/java/io/netty/channel/ChannelBufferHolder.java
@@ -41,7 +41,7 @@ public final class ChannelBufferHolder {
         }
         msgBuf = null;
         this.byteBuf = byteBuf;
-        type = ChannelBufferType.STREAM;
+        type = ChannelBufferType.BYTE;
     }
 
     public ChannelBufferType type() {
@@ -67,7 +67,7 @@ public final class ChannelBufferHolder {
         switch (type) {
         case MESSAGE:
             return "MessageBuffer(" + msgBuf.size() + ')';
-        case STREAM:
+        case BYTE:
             return byteBuf.toString();
         default:
             throw new Error();
@@ -78,7 +78,7 @@ public final class ChannelBufferHolder {
         switch (type) {
         case MESSAGE:
             return msgBuf.size();
-        case STREAM:
+        case BYTE:
             return byteBuf.readableBytes();
         default:
             throw new Error();
@@ -89,7 +89,7 @@ public final class ChannelBufferHolder {
         switch (type) {
         case MESSAGE:
             return msgBuf.isEmpty();
-        case STREAM:
+        case BYTE:
             return !byteBuf.readable();
         default:
             throw new Error();
diff --git a/transport/src/main/java/io/netty/channel/ChannelBufferType.java b/transport/src/main/java/io/netty/channel/ChannelBufferType.java
index 37f43f9368..237e559903 100644
--- a/transport/src/main/java/io/netty/channel/ChannelBufferType.java
+++ b/transport/src/main/java/io/netty/channel/ChannelBufferType.java
@@ -16,6 +16,6 @@
 package io.netty.channel;
 
 public enum ChannelBufferType {
-    STREAM,
+    BYTE,
     MESSAGE;
 }
diff --git a/transport/src/main/java/io/netty/channel/ChannelInboundStreamHandlerAdapter.java b/transport/src/main/java/io/netty/channel/ChannelInboundByteHandlerAdapter.java
similarity index 92%
rename from transport/src/main/java/io/netty/channel/ChannelInboundStreamHandlerAdapter.java
rename to transport/src/main/java/io/netty/channel/ChannelInboundByteHandlerAdapter.java
index 048475b635..9d732f9466 100644
--- a/transport/src/main/java/io/netty/channel/ChannelInboundStreamHandlerAdapter.java
+++ b/transport/src/main/java/io/netty/channel/ChannelInboundByteHandlerAdapter.java
@@ -18,7 +18,7 @@ package io.netty.channel;
 import io.netty.buffer.ChannelBuffer;
 
 
-public class ChannelInboundStreamHandlerAdapter extends ChannelInboundHandlerAdapter {
+public class ChannelInboundByteHandlerAdapter extends ChannelInboundHandlerAdapter {
 
     @Override
     public ChannelBufferHolder newInboundBuffer(ChannelHandlerContext ctx) throws Exception {
diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundStreamHandlerAdapter.java b/transport/src/main/java/io/netty/channel/ChannelOutboundByteHandlerAdapter.java
similarity index 89%
rename from transport/src/main/java/io/netty/channel/ChannelOutboundStreamHandlerAdapter.java
rename to transport/src/main/java/io/netty/channel/ChannelOutboundByteHandlerAdapter.java
index 77409cec69..b972651253 100644
--- a/transport/src/main/java/io/netty/channel/ChannelOutboundStreamHandlerAdapter.java
+++ b/transport/src/main/java/io/netty/channel/ChannelOutboundByteHandlerAdapter.java
@@ -15,7 +15,7 @@
  */
 package io.netty.channel;
 
-public class ChannelOutboundStreamHandlerAdapter extends ChannelOutboundHandlerAdapter {
+public class ChannelOutboundByteHandlerAdapter extends ChannelOutboundHandlerAdapter {
     @Override
     public ChannelBufferHolder newOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
         return ChannelBufferHolders.byteBuffer();
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
index 19e47edc15..63ac7e7b37 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
@@ -59,8 +59,8 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
     // The content written into a bridge is flushed into the actual buffer by flushBridge().
     final AtomicReference inMsgBridge;
     final AtomicReference outMsgBridge;
-    final AtomicReference inByteBridge;
-    final AtomicReference outByteBridge;
+    final AtomicReference inByteBridge;
+    final AtomicReference outByteBridge;
 
     // Runnables that calls handlers
     final Runnable fireChannelRegisteredTask = new Runnable() {
@@ -208,9 +208,9 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
             }
 
             switch (holder.type()) {
-            case STREAM:
+            case BYTE:
                 inByteBuf = holder.byteBuffer();
-                inByteBridge = new AtomicReference();
+                inByteBridge = new AtomicReference();
                 inMsgBuf = null;
                 inMsgBridge = null;
                 break;
@@ -239,9 +239,9 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
             }
 
             switch (holder.type()) {
-            case STREAM:
+            case BYTE:
                 outByteBuf = holder.byteBuffer();
-                outByteBridge = new AtomicReference();
+                outByteBridge = new AtomicReference();
                 outMsgBuf = null;
                 outMsgBridge = null;
                 break;
@@ -269,7 +269,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
                 bridge.fill();
             }
         } else if (inByteBridge != null) {
-            StreamBridge bridge = inByteBridge.get();
+            ByteBridge bridge = inByteBridge.get();
             if (bridge != null) {
                 bridge.fill();
             }
@@ -281,7 +281,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
                 bridge.fill();
             }
         } else if (outByteBridge != null) {
-            StreamBridge bridge = outByteBridge.get();
+            ByteBridge bridge = outByteBridge.get();
             if (bridge != null) {
                 bridge.fill();
             }
@@ -295,7 +295,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
                 bridge.flush(inMsgBuf);
             }
         } else if (inByteBridge != null) {
-            StreamBridge bridge = inByteBridge.get();
+            ByteBridge bridge = inByteBridge.get();
             if (bridge != null) {
                 bridge.flush(inByteBuf);
             }
@@ -307,7 +307,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
                 bridge.flush(outMsgBuf);
             }
         } else if (outByteBridge != null) {
-            StreamBridge bridge = outByteBridge.get();
+            ByteBridge bridge = outByteBridge.get();
             if (bridge != null) {
                 bridge.flush(outByteBuf);
             }
@@ -452,9 +452,9 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
                 if (ctx.executor().inEventLoop(currentThread)) {
                     return ctx.inByteBuf;
                 } else {
-                    StreamBridge bridge = ctx.inByteBridge.get();
+                    ByteBridge bridge = ctx.inByteBridge.get();
                     if (bridge == null) {
-                        bridge = new StreamBridge();
+                        bridge = new ByteBridge();
                         if (!ctx.inByteBridge.compareAndSet(null, bridge)) {
                             bridge = ctx.inByteBridge.get();
                         }
@@ -762,7 +762,7 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
         }
     }
 
-    static final class StreamBridge {
+    static final class ByteBridge {
         final ChannelBuffer byteBuf = ChannelBuffers.dynamicBuffer();
         final BlockingQueue exchangeBuf = QueueFactory.createQueue();
 
diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
index 6af7b09af7..6822652426 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
@@ -18,7 +18,7 @@ package io.netty.channel;
 import static io.netty.channel.DefaultChannelHandlerContext.*;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.DefaultChannelHandlerContext.MessageBridge;
-import io.netty.channel.DefaultChannelHandlerContext.StreamBridge;
+import io.netty.channel.DefaultChannelHandlerContext.ByteBridge;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 
@@ -893,7 +893,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
 
     @Override
     public ChannelBuffer inboundByteBuffer() {
-        if (channel.bufferType() != ChannelBufferType.STREAM) {
+        if (channel.bufferType() != ChannelBufferType.BYTE) {
             throw new NoSuchBufferException(
                     "The first inbound buffer of this channel must be a byte buffer.");
         }
@@ -947,9 +947,9 @@ public class DefaultChannelPipeline implements ChannelPipeline {
                 if (ctx.executor().inEventLoop(currentThread)) {
                     return ctx.outByteBuf;
                 } else {
-                    StreamBridge bridge = ctx.outByteBridge.get();
+                    ByteBridge bridge = ctx.outByteBridge.get();
                     if (bridge == null) {
-                        bridge = new StreamBridge();
+                        bridge = new ByteBridge();
                         if (!ctx.outByteBridge.compareAndSet(null, bridge)) {
                             bridge = ctx.outByteBridge.get();
                         }
@@ -1434,7 +1434,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
         @Override
         public ChannelBufferHolder newOutboundBuffer(ChannelHandlerContext ctx) throws Exception {
             switch (channel.bufferType()) {
-            case STREAM:
+            case BYTE:
                 return ChannelBufferHolders.byteBuffer();
             case MESSAGE:
                 if (channel instanceof ServerChannel) {
diff --git a/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java
index 75d4025d5c..bd11273f43 100644
--- a/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java
+++ b/transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java
@@ -83,7 +83,7 @@ public abstract class AbstractEmbeddedChannel extends AbstractChannel {
             throw new IllegalArgumentException("handlers does not provide any buffers.");
         }
 
-        p.addLast(new LastInboundMessageHandler(), new LastInboundStreamHandler());
+        p.addLast(new LastInboundMessageHandler(), new LastInboundByteHandler());
         loop.register(this);
     }
 
@@ -222,7 +222,7 @@ public abstract class AbstractEmbeddedChannel extends AbstractChannel {
         }
     }
 
-    private final class LastInboundStreamHandler extends ChannelInboundHandlerAdapter {
+    private final class LastInboundByteHandler extends ChannelInboundHandlerAdapter {
         @Override
         public ChannelBufferHolder newInboundBuffer(ChannelHandlerContext ctx) throws Exception {
             return ChannelBufferHolders.byteBuffer(lastInboundByteBuffer);
diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedStreamChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java
similarity index 93%
rename from transport/src/main/java/io/netty/channel/embedded/EmbeddedStreamChannel.java
rename to transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java
index 6c2a33af18..48faadb8c0 100644
--- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedStreamChannel.java
+++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java
@@ -20,15 +20,15 @@ import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelBufferType;
 
-public class EmbeddedStreamChannel extends AbstractEmbeddedChannel {
+public class EmbeddedByteChannel extends AbstractEmbeddedChannel {
 
-    public EmbeddedStreamChannel(ChannelHandler... handlers) {
+    public EmbeddedByteChannel(ChannelHandler... handlers) {
         super(ChannelBuffers.dynamicBuffer(), handlers);
     }
 
     @Override
     public ChannelBufferType bufferType() {
-        return ChannelBufferType.STREAM;
+        return ChannelBufferType.BYTE;
     }
 
     public ChannelBuffer inboundBuffer() {
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioStreamChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java
similarity index 93%
rename from transport/src/main/java/io/netty/channel/socket/nio/AbstractNioStreamChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java
index edbcc53873..b51a61a5ec 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioStreamChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java
@@ -24,24 +24,24 @@ import java.io.IOException;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 
-abstract class AbstractNioStreamChannel extends AbstractNioChannel {
+abstract class AbstractNioByteChannel extends AbstractNioChannel {
 
-    protected AbstractNioStreamChannel(
+    protected AbstractNioByteChannel(
             Channel parent, Integer id, SelectableChannel ch) {
         super(parent, id, ch, SelectionKey.OP_READ);
     }
 
     @Override
     public ChannelBufferType bufferType() {
-        return ChannelBufferType.STREAM;
+        return ChannelBufferType.BYTE;
     }
 
     @Override
     protected Unsafe newUnsafe() {
-        return new NioStreamUnsafe();
+        return new NioByteUnsafe();
     }
 
-    private class NioStreamUnsafe extends AbstractNioUnsafe {
+    private class NioByteUnsafe extends AbstractNioUnsafe {
         @Override
         public void read() {
             assert eventLoop().inEventLoop();
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
index 01c896db48..23d05411de 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
@@ -28,7 +28,7 @@ import java.net.SocketAddress;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 
-public class NioSocketChannel extends AbstractNioStreamChannel implements io.netty.channel.socket.SocketChannel {
+public class NioSocketChannel extends AbstractNioByteChannel implements io.netty.channel.socket.SocketChannel {
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioSocketChannel.class);
 
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java
similarity index 91%
rename from transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java
index 6751dd7c0c..5e73069246 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java
@@ -22,23 +22,23 @@ import io.netty.channel.ChannelBufferType;
 
 import java.io.IOException;
 
-abstract class AbstractOioStreamChannel extends AbstractOioChannel {
+abstract class AbstractOioByteChannel extends AbstractOioChannel {
 
-    protected AbstractOioStreamChannel(Channel parent, Integer id) {
+    protected AbstractOioByteChannel(Channel parent, Integer id) {
         super(parent, id);
     }
 
     @Override
     public ChannelBufferType bufferType() {
-        return ChannelBufferType.STREAM;
+        return ChannelBufferType.BYTE;
     }
 
     @Override
     protected Unsafe newUnsafe() {
-        return new OioStreamUnsafe();
+        return new OioByteUnsafe();
     }
 
-    private class OioStreamUnsafe extends AbstractOioUnsafe {
+    private class OioByteUnsafe extends AbstractOioUnsafe {
         @Override
         public void read() {
             assert eventLoop().inEventLoop();
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
index 14965a89fc..5a89d0d82e 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
@@ -32,7 +32,7 @@ import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.nio.channels.NotYetConnectedException;
 
-public class OioSocketChannel extends AbstractOioStreamChannel
+public class OioSocketChannel extends AbstractOioByteChannel
                               implements SocketChannel {
 
     private static final InternalLogger logger =