Move ChannelBufferType to netty-buffers and rename it to ChannelBufType

- Also add ChannelBuf.type()
rajdavies · Jun 12, 2012 · 3b562c9 · 3b562c9
1 parent ecd0ae5
commit 3b562c9
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 28 deletions.
diff --git a/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java
@@ -51,6 +51,11 @@ public boolean isPooled() {
         return false;
     }
 
+    @Override
+    public ChannelBufType type() {
+        return ChannelBufType.BYTE;
+    }
+
     @Override
     public int readerIndex() {
         return readerIndex;

diff --git a/buffer/src/main/java/io/netty/buffer/ChannelBuf.java b/buffer/src/main/java/io/netty/buffer/ChannelBuf.java
@@ -16,5 +16,6 @@
 package io.netty.buffer;
 
 public interface ChannelBuf {
+    ChannelBufType type();
     boolean isPooled();
 }
diff --git a/...a/io/netty/channel/ChannelBufferType.java → .../java/io/netty/buffer/ChannelBufType.java b/...a/io/netty/channel/ChannelBufferType.java → .../java/io/netty/buffer/ChannelBufType.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel;
+package io.netty.buffer;
 
-public enum ChannelBufferType {
+public enum ChannelBufType {
     BYTE,
     MESSAGE
 }
diff --git a/buffer/src/main/java/io/netty/buffer/DefaultMessageBuf.java b/buffer/src/main/java/io/netty/buffer/DefaultMessageBuf.java
@@ -37,6 +37,11 @@ public boolean isPooled() {
         return false;
     }
 
+    @Override
+    public ChannelBufType type() {
+        return ChannelBufType.MESSAGE;
+    }
+
     @Override
     public int drainTo(Collection<? super T> c) {
         int cnt = 0;

diff --git a/buffer/src/main/java/io/netty/buffer/QueueBackedMessageBuf.java b/buffer/src/main/java/io/netty/buffer/QueueBackedMessageBuf.java
@@ -35,6 +35,11 @@ public boolean isPooled() {
         return false;
     }
 
+    @Override
+    public ChannelBufType type() {
+        return ChannelBufType.MESSAGE;
+    }
+
     @Override
     public boolean add(T e) {
         return queue.add(e);

diff --git a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java
@@ -67,6 +67,11 @@ public boolean isPooled() {
         return buf.isPooled();
     }
 
+    @Override
+    public ChannelBufType type() {
+        return ChannelBufType.MESSAGE;
+    }
+
     @Override
     public ByteBufFactory factory() {
         return buf.factory();

diff --git a/codec/src/main/java/io/netty/handler/codec/ReplayingDecoderBuffer.java b/codec/src/main/java/io/netty/handler/codec/ReplayingDecoderBuffer.java
@@ -18,6 +18,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufFactory;
 import io.netty.buffer.ByteBufIndexFinder;
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.SwappedByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.Signal;
@@ -63,6 +64,11 @@ public int capacity() {
         }
     }
 
+    @Override
+    public ChannelBufType type() {
+        return ChannelBufType.BYTE;
+    }
+
     @Override
     public boolean isPooled() {
         return false;

diff --git a/transport/src/main/java/io/netty/channel/AbstractServerChannel.java b/transport/src/main/java/io/netty/channel/AbstractServerChannel.java
@@ -16,6 +16,7 @@
 package io.netty.channel;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 
 import java.net.SocketAddress;
@@ -51,8 +52,8 @@ public MessageBuf<Object> outboundMessageBuffer() {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.MESSAGE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.MESSAGE;
     }
 
     @Override

diff --git a/transport/src/main/java/io/netty/channel/Channel.java b/transport/src/main/java/io/netty/channel/Channel.java
@@ -16,6 +16,7 @@
 package io.netty.channel;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.socket.DatagramChannel;
 import io.netty.channel.socket.ServerSocketChannel;
@@ -138,7 +139,7 @@ public interface Channel extends AttributeMap, ChannelOutboundInvoker, ChannelFu
     boolean isRegistered();
     boolean isActive();
 
-    ChannelBufferType bufferType();
+    ChannelBufType bufferType();
 
     ByteBuf outboundByteBuffer();
     <T> MessageBuf<T> outboundMessageBuffer();

diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
@@ -18,6 +18,7 @@
 import static io.netty.channel.DefaultChannelHandlerContext.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ChannelBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.DefaultChannelHandlerContext.ByteBridge;
@@ -886,7 +887,7 @@ public String toString() {
 
     @Override
     public MessageBuf<Object> inboundMessageBuffer() {
-        if (channel.bufferType() != ChannelBufferType.MESSAGE) {
+        if (channel.bufferType() != ChannelBufType.MESSAGE) {
             throw new NoSuchBufferException(
                     "The first inbound buffer of this channel must be a message buffer.");
         }
@@ -895,7 +896,7 @@ public MessageBuf<Object> inboundMessageBuffer() {
 
     @Override
     public ByteBuf inboundByteBuffer() {
-        if (channel.bufferType() != ChannelBufferType.BYTE) {
+        if (channel.bufferType() != ChannelBufType.BYTE) {
             throw new NoSuchBufferException(
                     "The first inbound buffer of this channel must be a byte buffer.");
         }

diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java
@@ -16,8 +16,8 @@
 package io.netty.channel.embedded;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelHandler;
 
 public class EmbeddedByteChannel extends AbstractEmbeddedChannel {
@@ -27,8 +27,8 @@ public EmbeddedByteChannel(ChannelHandler... handlers) {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.BYTE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.BYTE;
     }
 
     public ByteBuf inboundBuffer() {

diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedMessageChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedMessageChannel.java
@@ -15,8 +15,8 @@
  */
 package io.netty.channel.embedded;
 
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelHandler;
 
 import java.util.ArrayDeque;
@@ -28,8 +28,8 @@ public EmbeddedMessageChannel(ChannelHandler... handlers) {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.MESSAGE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.MESSAGE;
     }
 
     public MessageBuf<Object> inboundBuffer() {

diff --git a/transport/src/main/java/io/netty/channel/local/LocalChannel.java b/transport/src/main/java/io/netty/channel/local/LocalChannel.java
@@ -15,10 +15,10 @@
  */
 package io.netty.channel.local;
 
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.AbstractChannel;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
@@ -68,8 +68,8 @@ public LocalChannel(Integer id) {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.MESSAGE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.MESSAGE;
     }
 
     @Override

diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java
@@ -16,8 +16,8 @@
 package io.netty.channel.socket.nio;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
@@ -32,8 +32,8 @@ protected AbstractNioByteChannel(
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.BYTE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.BYTE;
     }
 
     @Override

diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioMessageChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioMessageChannel.java
@@ -15,9 +15,9 @@
  */
 package io.netty.channel.socket.nio;
 
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
@@ -31,8 +31,8 @@ protected AbstractNioMessageChannel(
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.MESSAGE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.MESSAGE;
     }
 
     @Override

diff --git a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java
@@ -16,8 +16,8 @@
 package io.netty.channel.socket.oio;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ChannelBufType;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
@@ -29,8 +29,8 @@ protected AbstractOioByteChannel(Channel parent, Integer id) {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.BYTE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.BYTE;
     }
 
     @Override

diff --git a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java
@@ -15,9 +15,9 @@
  */
 package io.netty.channel.socket.oio;
 
+import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelBufferType;
 import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
@@ -29,8 +29,8 @@ protected AbstractOioMessageChannel(Channel parent, Integer id) {
     }
 
     @Override
-    public ChannelBufferType bufferType() {
-        return ChannelBufferType.MESSAGE;
+    public ChannelBufType bufferType() {
+        return ChannelBufType.MESSAGE;
     }
 
     @Override