* // Create a buffer whose readerIndex, writerIndex and capacity are
* // 0, 0 and 8 respectively.
- * {@link ByteBuf} buf = {@link ChannelBuffers}.buffer(8);
+ * {@link ByteBuf} buf = {@link ByteBufs}.buffer(8);
*
* // IndexOutOfBoundsException is thrown because the specified
* // readerIndex (2) cannot be greater than the current writerIndex (0).
@@ -305,7 +305,7 @@ public interface ByteBuf extends Comparable {
*
* // Create a buffer whose readerIndex, writerIndex and capacity are
* // 0, 8 and 8 respectively.
- * {@link ByteBuf} buf = {@link ChannelBuffers}.wrappedBuffer(new byte[8]);
+ * {@link ByteBuf} buf = {@link ByteBufs}.wrappedBuffer(new byte[8]);
*
* // readerIndex becomes 8.
* buf.readLong();
diff --git a/buffer/src/main/java/io/netty/buffer/ChannelBuffers.java b/buffer/src/main/java/io/netty/buffer/ByteBufs.java
similarity index 99%
rename from buffer/src/main/java/io/netty/buffer/ChannelBuffers.java
rename to buffer/src/main/java/io/netty/buffer/ByteBufs.java
index dfefbd055b..f611c9cf97 100644
--- a/buffer/src/main/java/io/netty/buffer/ChannelBuffers.java
+++ b/buffer/src/main/java/io/netty/buffer/ByteBufs.java
@@ -37,7 +37,7 @@ import java.util.List;
* This classes is intended to be used with Java 5 static import statement:
*
*
- * import static io.netty.buffer.{@link ChannelBuffers}.*;
+ * import static io.netty.buffer.{@link ByteBufs}.*;
*
* {@link ByteBuf} heapBuffer = buffer(128);
* {@link ByteBuf} directBuffer = directBuffer(256);
@@ -84,7 +84,7 @@ import java.util.List;
* @apiviz.landmark
* @apiviz.has io.netty.buffer.ChannelBuffer oneway - - creates
*/
-public final class ChannelBuffers {
+public final class ByteBufs {
/**
* Big endian byte order.
@@ -803,7 +803,7 @@ public final class ChannelBuffers {
}
private static ByteBuf copiedBuffer(ByteOrder endianness, CharBuffer buffer, Charset charset) {
- ByteBuffer dst = ChannelBuffers.encodeString(buffer, charset);
+ ByteBuffer dst = ByteBufs.encodeString(buffer, charset);
ByteBuf result = wrappedBuffer(endianness, dst.array());
result.writerIndex(dst.remaining());
return result;
@@ -1321,7 +1321,7 @@ public final class ChannelBuffers {
return dst.flip().toString();
}
- private ChannelBuffers() {
+ private ByteBufs() {
// Unused
}
}
diff --git a/buffer/src/main/java/io/netty/buffer/ChannelBuf.java b/buffer/src/main/java/io/netty/buffer/ChannelBuf.java
new file mode 100644
index 0000000000..8cf10831f1
--- /dev/null
+++ b/buffer/src/main/java/io/netty/buffer/ChannelBuf.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.buffer;
+
+public interface ChannelBuf {
+ boolean isPooled();
+}
diff --git a/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java b/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
index c73e18e8c7..a562232488 100644
--- a/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
@@ -31,7 +31,7 @@ import java.util.List;
/**
* A virtual buffer which shows multiple buffers as a single merged buffer. It
- * is recommended to use {@link ChannelBuffers#wrappedBuffer(ByteBuf...)}
+ * is recommended to use {@link ByteBufs#wrappedBuffer(ByteBuf...)}
* instead of calling the constructor explicitly.
*/
public class CompositeByteBuf extends AbstractByteBuf {
@@ -581,20 +581,20 @@ public class CompositeByteBuf extends AbstractByteBuf {
public ByteBuf slice(int index, int length) {
if (index == 0) {
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
} else if (index < 0 || index > capacity() - length) {
throw new IndexOutOfBoundsException("Invalid index: " + index
+ " - Bytes needed: " + (index + length) + ", maximum is "
+ capacity());
} else if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
List components = decompose(index, length);
switch (components.size()) {
case 0:
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
case 1:
return components.get(0);
default:
@@ -710,7 +710,7 @@ public class CompositeByteBuf extends AbstractByteBuf {
// Add a new buffer so that the capacity of this composite buffer does
// not decrease due to the discarded components.
// XXX Might create too many components if discarded by small amount.
- final ByteBuf padding = ChannelBuffers.buffer(order(), localReaderIndex);
+ final ByteBuf padding = ByteBufs.buffer(order(), localReaderIndex);
padding.writerIndex(localReaderIndex);
list.add(padding);
diff --git a/buffer/src/main/java/io/netty/buffer/DefaultMessageBuf.java b/buffer/src/main/java/io/netty/buffer/DefaultMessageBuf.java
new file mode 100644
index 0000000000..2a4d6061f9
--- /dev/null
+++ b/buffer/src/main/java/io/netty/buffer/DefaultMessageBuf.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.buffer;
+
+import java.util.ArrayDeque;
+import java.util.Collection;
+
+public class DefaultMessageBuf extends ArrayDeque implements MessageBuf {
+
+ private static final long serialVersionUID = 1229808623624907552L;
+
+ public DefaultMessageBuf() { }
+
+ public DefaultMessageBuf(Collection c) {
+ super(c);
+ }
+
+ public DefaultMessageBuf(int initialCapacity) {
+ super(initialCapacity);
+ }
+
+ @Override
+ public boolean isPooled() {
+ return false;
+ }
+
+ @Override
+ public int drainTo(Collection c) {
+ int cnt = 0;
+ for (;;) {
+ T o = poll();
+ if (o == null) {
+ break;
+ }
+ c.add(o);
+ cnt ++;
+ }
+ return cnt;
+ }
+
+ @Override
+ public int drainTo(Collection c, int maxElements) {
+ int cnt = 0;
+ while (cnt < maxElements) {
+ T o = poll();
+ if (o == null) {
+ break;
+ }
+ c.add(o);
+ cnt ++;
+ }
+ return cnt;
+ }
+}
diff --git a/buffer/src/main/java/io/netty/buffer/DirectByteBufFactory.java b/buffer/src/main/java/io/netty/buffer/DirectByteBufFactory.java
index 2d4c0104de..a0f9b0108f 100644
--- a/buffer/src/main/java/io/netty/buffer/DirectByteBufFactory.java
+++ b/buffer/src/main/java/io/netty/buffer/DirectByteBufFactory.java
@@ -111,10 +111,10 @@ public class DirectByteBufFactory extends AbstractByteBufFactory {
throw new IllegalArgumentException("capacity: " + capacity);
}
if (capacity == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
if (capacity >= preallocatedBufCapacity) {
- return ChannelBuffers.directBuffer(order, capacity);
+ return ByteBufs.directBuffer(order, capacity);
}
ByteBuf slice;
@@ -136,7 +136,7 @@ public class DirectByteBufFactory extends AbstractByteBufFactory {
throw new IndexOutOfBoundsException("offset: " + offset);
}
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
if (offset + length > array.length) {
throw new IndexOutOfBoundsException("length: " + length);
@@ -150,7 +150,7 @@ public class DirectByteBufFactory extends AbstractByteBufFactory {
@Override
public ByteBuf getBuffer(ByteBuffer nioBuffer) {
if (!nioBuffer.isReadOnly() && nioBuffer.isDirect()) {
- return ChannelBuffers.wrappedBuffer(nioBuffer);
+ return ByteBufs.wrappedBuffer(nioBuffer);
}
ByteBuf buf = getBuffer(nioBuffer.order(), nioBuffer.remaining());
@@ -164,14 +164,14 @@ public class DirectByteBufFactory extends AbstractByteBufFactory {
ByteBuf slice;
synchronized (bigEndianLock) {
if (preallocatedBEBuf == null) {
- preallocatedBEBuf = ChannelBuffers.directBuffer(ByteOrder.BIG_ENDIAN, preallocatedBufCapacity);
+ preallocatedBEBuf = ByteBufs.directBuffer(ByteOrder.BIG_ENDIAN, preallocatedBufCapacity);
slice = preallocatedBEBuf.slice(0, capacity);
preallocatedBEBufPos = capacity;
} else if (preallocatedBEBuf.capacity() - preallocatedBEBufPos >= capacity) {
slice = preallocatedBEBuf.slice(preallocatedBEBufPos, capacity);
preallocatedBEBufPos += capacity;
} else {
- preallocatedBEBuf = ChannelBuffers.directBuffer(ByteOrder.BIG_ENDIAN, preallocatedBufCapacity);
+ preallocatedBEBuf = ByteBufs.directBuffer(ByteOrder.BIG_ENDIAN, preallocatedBufCapacity);
slice = preallocatedBEBuf.slice(0, capacity);
preallocatedBEBufPos = capacity;
}
@@ -183,14 +183,14 @@ public class DirectByteBufFactory extends AbstractByteBufFactory {
ByteBuf slice;
synchronized (littleEndianLock) {
if (preallocatedLEBuf == null) {
- preallocatedLEBuf = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, preallocatedBufCapacity);
+ preallocatedLEBuf = ByteBufs.directBuffer(ByteOrder.LITTLE_ENDIAN, preallocatedBufCapacity);
slice = preallocatedLEBuf.slice(0, capacity);
preallocatedLEBufPos = capacity;
} else if (preallocatedLEBuf.capacity() - preallocatedLEBufPos >= capacity) {
slice = preallocatedLEBuf.slice(preallocatedLEBufPos, capacity);
preallocatedLEBufPos += capacity;
} else {
- preallocatedLEBuf = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, preallocatedBufCapacity);
+ preallocatedLEBuf = ByteBufs.directBuffer(ByteOrder.LITTLE_ENDIAN, preallocatedBufCapacity);
slice = preallocatedLEBuf.slice(0, capacity);
preallocatedLEBufPos = capacity;
}
diff --git a/buffer/src/main/java/io/netty/buffer/DynamicByteBuf.java b/buffer/src/main/java/io/netty/buffer/DynamicByteBuf.java
index 9d66e483eb..1f69399010 100644
--- a/buffer/src/main/java/io/netty/buffer/DynamicByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/DynamicByteBuf.java
@@ -26,7 +26,7 @@ import java.nio.channels.ScatteringByteChannel;
/**
* A dynamic capacity buffer which increases its capacity as needed. It is
- * recommended to use {@link ChannelBuffers#dynamicBuffer(int)} instead of
+ * recommended to use {@link ByteBufs#dynamicBuffer(int)} instead of
* calling the constructor explicitly.
*/
public class DynamicByteBuf extends AbstractByteBuf {
@@ -310,12 +310,12 @@ public class DynamicByteBuf extends AbstractByteBuf {
public ByteBuf slice(int index, int length) {
if (index == 0) {
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return new TruncatedByteBuf(this, length);
} else {
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return new SlicedByteBuf(this, index, length);
}
diff --git a/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java b/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java
index a4fb8f30d7..87cc431c81 100644
--- a/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/HeapByteBuf.java
@@ -172,7 +172,7 @@ public abstract class HeapByteBuf extends AbstractByteBuf {
public ByteBuf slice(int index, int length) {
if (index == 0) {
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
if (length == array.length) {
ByteBuf slice = duplicate();
@@ -183,7 +183,7 @@ public abstract class HeapByteBuf extends AbstractByteBuf {
}
} else {
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return new SlicedByteBuf(this, index, length);
}
diff --git a/buffer/src/main/java/io/netty/buffer/HeapByteBufFactory.java b/buffer/src/main/java/io/netty/buffer/HeapByteBufFactory.java
index 996ee2f3ef..e20db458e7 100644
--- a/buffer/src/main/java/io/netty/buffer/HeapByteBufFactory.java
+++ b/buffer/src/main/java/io/netty/buffer/HeapByteBufFactory.java
@@ -66,18 +66,18 @@ public class HeapByteBufFactory extends AbstractByteBufFactory {
@Override
public ByteBuf getBuffer(ByteOrder order, int capacity) {
- return ChannelBuffers.buffer(order, capacity);
+ return ByteBufs.buffer(order, capacity);
}
@Override
public ByteBuf getBuffer(ByteOrder order, byte[] array, int offset, int length) {
- return ChannelBuffers.wrappedBuffer(order, array, offset, length);
+ return ByteBufs.wrappedBuffer(order, array, offset, length);
}
@Override
public ByteBuf getBuffer(ByteBuffer nioBuffer) {
if (nioBuffer.hasArray()) {
- return ChannelBuffers.wrappedBuffer(nioBuffer);
+ return ByteBufs.wrappedBuffer(nioBuffer);
}
ByteBuf buf = getBuffer(nioBuffer.order(), nioBuffer.remaining());
diff --git a/buffer/src/main/java/io/netty/buffer/LittleEndianHeapByteBuf.java b/buffer/src/main/java/io/netty/buffer/LittleEndianHeapByteBuf.java
index 4fa0d1db3c..f861e9f6e7 100644
--- a/buffer/src/main/java/io/netty/buffer/LittleEndianHeapByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/LittleEndianHeapByteBuf.java
@@ -19,8 +19,8 @@ import java.nio.ByteOrder;
/**
- * A little-endian Java heap buffer. It is recommended to use {@link ChannelBuffers#buffer(ByteOrder, int)}
- * and {@link ChannelBuffers#wrappedBuffer(ByteOrder, byte[])} instead of
+ * A little-endian Java heap buffer. It is recommended to use {@link ByteBufs#buffer(ByteOrder, int)}
+ * and {@link ByteBufs#wrappedBuffer(ByteOrder, byte[])} instead of
* calling the constructor explicitly.
*/
public class LittleEndianHeapByteBuf extends HeapByteBuf {
diff --git a/buffer/src/main/java/io/netty/buffer/MessageBuf.java b/buffer/src/main/java/io/netty/buffer/MessageBuf.java
new file mode 100644
index 0000000000..1c55fc0f74
--- /dev/null
+++ b/buffer/src/main/java/io/netty/buffer/MessageBuf.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.buffer;
+
+import java.util.Collection;
+import java.util.Queue;
+
+public interface MessageBuf extends ChannelBuf, Queue {
+ int drainTo(Collection c);
+ int drainTo(Collection c, int maxElements);
+}
diff --git a/buffer/src/main/java/io/netty/buffer/MessageBufs.java b/buffer/src/main/java/io/netty/buffer/MessageBufs.java
new file mode 100644
index 0000000000..53c1ccae18
--- /dev/null
+++ b/buffer/src/main/java/io/netty/buffer/MessageBufs.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.buffer;
+
+import java.util.Queue;
+
+public final class MessageBufs {
+
+ public static MessageBuf messageBuffer() {
+ return new DefaultMessageBuf();
+ }
+
+ public static MessageBuf messageBuffer(int initialCapacity) {
+ return new DefaultMessageBuf(initialCapacity);
+ }
+
+ public static MessageBuf messageBuffer(Queue queue) {
+ return new QueueBackedMessageBuf(queue);
+ }
+
+
+ private MessageBufs() { }
+}
diff --git a/buffer/src/main/java/io/netty/buffer/NioBufferBackedByteBuf.java b/buffer/src/main/java/io/netty/buffer/NioBufferBackedByteBuf.java
index b774c6d5f2..72a46b69f3 100644
--- a/buffer/src/main/java/io/netty/buffer/NioBufferBackedByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/NioBufferBackedByteBuf.java
@@ -25,8 +25,8 @@ import java.nio.channels.GatheringByteChannel;
import java.nio.channels.ScatteringByteChannel;
/**
- * A NIO {@link ByteBuffer} based buffer. It is recommended to use {@link ChannelBuffers#directBuffer(int)}
- * and {@link ChannelBuffers#wrappedBuffer(ByteBuffer)} instead of calling the
+ * A NIO {@link ByteBuffer} based buffer. It is recommended to use {@link ByteBufs#directBuffer(int)}
+ * and {@link ByteBufs#wrappedBuffer(ByteBuffer)} instead of calling the
* constructor explicitly.
*/
public class NioBufferBackedByteBuf extends AbstractByteBuf {
@@ -299,7 +299,7 @@ public class NioBufferBackedByteBuf extends AbstractByteBuf {
return slice;
} else {
if (index >= 0 && length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return new NioBufferBackedByteBuf(
((ByteBuffer) tmpBuf.clear().position(
diff --git a/buffer/src/main/java/io/netty/buffer/QueueBackedMessageBuf.java b/buffer/src/main/java/io/netty/buffer/QueueBackedMessageBuf.java
new file mode 100644
index 0000000000..14fd259167
--- /dev/null
+++ b/buffer/src/main/java/io/netty/buffer/QueueBackedMessageBuf.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.buffer;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Queue;
+
+public class QueueBackedMessageBuf implements MessageBuf {
+
+ private final Queue queue;
+
+ public QueueBackedMessageBuf(Queue queue) {
+ if (queue == null) {
+ throw new NullPointerException("queue");
+ }
+ this.queue = queue;
+ }
+
+ @Override
+ public boolean isPooled() {
+ return false;
+ }
+
+ @Override
+ public boolean add(T e) {
+ return queue.add(e);
+ }
+
+ @Override
+ public boolean offer(T e) {
+ return queue.offer(e);
+ }
+
+ @Override
+ public T remove() {
+ return queue.remove();
+ }
+
+ @Override
+ public T poll() {
+ return queue.poll();
+ }
+
+ @Override
+ public T element() {
+ return queue.element();
+ }
+
+ @Override
+ public T peek() {
+ return queue.peek();
+ }
+
+ @Override
+ public int size() {
+ return queue.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return queue.isEmpty();
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return queue.contains(o);
+ }
+
+ @Override
+ public Iterator iterator() {
+ return queue.iterator();
+ }
+
+ @Override
+ public Object[] toArray() {
+ return queue.toArray();
+ }
+
+ @Override
+ public E[] toArray(E[] a) {
+ return queue.toArray(a);
+ }
+
+ @Override
+ public boolean remove(Object o) {
+ return queue.remove(o);
+ }
+
+ @Override
+ public boolean containsAll(Collection c) {
+ return queue.containsAll(c);
+ }
+
+ @Override
+ public boolean addAll(Collection c) {
+ return queue.addAll(c);
+ }
+
+ @Override
+ public boolean removeAll(Collection c) {
+ return queue.removeAll(c);
+ }
+
+ @Override
+ public boolean retainAll(Collection c) {
+ return queue.retainAll(c);
+ }
+
+ @Override
+ public void clear() {
+ queue.clear();
+ }
+
+ @Override
+ public int drainTo(Collection c) {
+ int cnt = 0;
+ for (;;) {
+ T o = poll();
+ if (o == null) {
+ break;
+ }
+ c.add(o);
+ cnt ++;
+ }
+ return cnt;
+ }
+
+ @Override
+ public int drainTo(Collection c, int maxElements) {
+ int cnt = 0;
+ while (cnt < maxElements) {
+ T o = poll();
+ if (o == null) {
+ break;
+ }
+ c.add(o);
+ cnt ++;
+ }
+ return cnt;
+ }
+
+ @Override
+ public String toString() {
+ return queue.toString();
+ }
+}
diff --git a/buffer/src/main/java/io/netty/buffer/ReadOnlyByteBuf.java b/buffer/src/main/java/io/netty/buffer/ReadOnlyByteBuf.java
index c7388736d7..66a70f4828 100644
--- a/buffer/src/main/java/io/netty/buffer/ReadOnlyByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/ReadOnlyByteBuf.java
@@ -26,7 +26,7 @@ import java.nio.channels.ScatteringByteChannel;
/**
* A derived buffer which forbids any write requests to its parent. It is
- * recommended to use {@link ChannelBuffers#unmodifiableBuffer(ByteBuf)}
+ * recommended to use {@link ByteBufs#unmodifiableBuffer(ByteBuf)}
* instead of calling the constructor explicitly.
*/
public class ReadOnlyByteBuf extends AbstractByteBuf implements WrappedByteBuf {
diff --git a/buffer/src/main/java/io/netty/buffer/SlicedByteBuf.java b/buffer/src/main/java/io/netty/buffer/SlicedByteBuf.java
index 3ce1afcc24..69372b2870 100644
--- a/buffer/src/main/java/io/netty/buffer/SlicedByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/SlicedByteBuf.java
@@ -140,7 +140,7 @@ public class SlicedByteBuf extends AbstractByteBuf implements WrappedByteBuf {
public ByteBuf slice(int index, int length) {
checkIndex(index, length);
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return new SlicedByteBuf(buffer, index + adjustment, length);
}
diff --git a/buffer/src/main/java/io/netty/buffer/TruncatedByteBuf.java b/buffer/src/main/java/io/netty/buffer/TruncatedByteBuf.java
index 42361f9179..b5f2484074 100644
--- a/buffer/src/main/java/io/netty/buffer/TruncatedByteBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/TruncatedByteBuf.java
@@ -133,7 +133,7 @@ public class TruncatedByteBuf extends AbstractByteBuf implements WrappedByteBuf
public ByteBuf slice(int index, int length) {
checkIndex(index, length);
if (length == 0) {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
return buffer.slice(index, length);
}
diff --git a/buffer/src/main/java/io/netty/buffer/package-info.java b/buffer/src/main/java/io/netty/buffer/package-info.java
index b596379e7e..54846b564d 100644
--- a/buffer/src/main/java/io/netty/buffer/package-info.java
+++ b/buffer/src/main/java/io/netty/buffer/package-info.java
@@ -98,7 +98,7 @@
* of the resulting string and let {@link java.lang.StringBuffer} expand itself
* on demand. Netty allows you to do the same via a dynamic buffer
* which is created by the
- * {@link io.netty.buffer.ChannelBuffers#dynamicBuffer()} method.
+ * {@link io.netty.buffer.ByteBufs#dynamicBuffer()} method.
*
* // A new dynamic buffer is created. Internally, the actual buffer is created
* // lazily to avoid potentially wasted memory space.
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
index 7aa9a27889..515d9a7e6b 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
@@ -15,7 +15,7 @@
*/
package io.netty.buffer;
-import static io.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ByteBufs.*;
import static org.junit.Assert.*;
import io.netty.util.CharsetUtil;
diff --git a/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
index b1418bb27b..ad30622a48 100644
--- a/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
@@ -15,7 +15,7 @@
*/
package io.netty.buffer;
-import static io.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ByteBufs.*;
import static org.junit.Assert.*;
import java.nio.ByteBuffer;
@@ -47,30 +47,30 @@ public abstract class AbstractCompositeChannelBufferTest extends
protected ByteBuf newBuffer(int length) {
buffers = new ArrayList();
for (int i = 0; i < length; i += 10) {
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[1]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[2]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[3]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[4]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[5]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[6]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[7]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[8]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
- buffers.add(ChannelBuffers.wrappedBuffer(order, new byte[9]));
- buffers.add(ChannelBuffers.EMPTY_BUFFER);
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[1]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[2]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[3]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[4]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[5]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[6]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[7]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[8]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
+ buffers.add(ByteBufs.wrappedBuffer(order, new byte[9]));
+ buffers.add(ByteBufs.EMPTY_BUFFER);
}
- buffer = ChannelBuffers.wrappedBuffer(buffers.toArray(new ByteBuf[buffers.size()]));
+ buffer = ByteBufs.wrappedBuffer(buffers.toArray(new ByteBuf[buffers.size()]));
buffer.writerIndex(length);
- buffer = ChannelBuffers.wrappedBuffer(buffer);
+ buffer = ByteBufs.wrappedBuffer(buffer);
assertEquals(length, buffer.capacity());
assertEquals(length, buffer.readableBytes());
assertFalse(buffer.writable());
@@ -113,20 +113,20 @@ public abstract class AbstractCompositeChannelBufferTest extends
a.writerIndex(a.writerIndex() + 1);
b.writerIndex(b.writerIndex() + 1);
assertEquals(a.writerIndex(), b.writerIndex());
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// now discard
a.discardReadBytes();
b.discardReadBytes();
assertEquals(a.readerIndex(), b.readerIndex());
assertEquals(a.writerIndex(), b.writerIndex());
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
a.resetReaderIndex();
b.resetReaderIndex();
assertEquals(a.readerIndex(), b.readerIndex());
a.resetWriterIndex();
b.resetWriterIndex();
assertEquals(a.writerIndex(), b.writerIndex());
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
}
@Test
@@ -154,57 +154,57 @@ public abstract class AbstractCompositeChannelBufferTest extends
a = wrappedBuffer(order, new byte[] { 1 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 1 }),
wrappedBuffer(order, new byte[] { 2 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 1 }),
wrappedBuffer(order, new byte[] { 2 }),
wrappedBuffer(order, new byte[] { 3 }));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4 }, 1, 2),
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4 }, 3, 1));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 1, 2 }),
wrappedBuffer(order, new byte[] { 4 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 0, 1, 2, 4, 5 }, 1, 2),
wrappedBuffer(order, new byte[] { 0, 1, 2, 4, 5 }, 3, 1));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 1, 2, 3 }),
wrappedBuffer(order, new byte[] { 4, 5, 6 }),
wrappedBuffer(order, new byte[] { 7, 8, 9, 10 }));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 1, 5),
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 6, 5));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 6 }),
wrappedBuffer(order, new byte[] { 7, 8, 5, 9, 10 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 6, 7, 8, 5, 9, 10, 11 }, 1, 5),
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 6, 7, 8, 5, 9, 10, 11 }, 6, 5));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
}
@Test
public void testWrappedBuffer() {
@@ -259,7 +259,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 1);
b.writeBytes(
wrappedBuffer(order, new byte[] { 2 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
@@ -269,7 +269,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writeBytes(
wrappedBuffer(order, new byte[] { 2 }));
b.writeBytes(wrappedBuffer(order, new byte[] { 3 }));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
@@ -278,7 +278,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 1);
b.writeBytes(
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4 }, 3, 1));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
@@ -287,7 +287,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 1);
b.writeBytes(
wrappedBuffer(order, new byte[] { 4 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, short length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3 });
@@ -296,7 +296,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 1);
b.writeBytes(
wrappedBuffer(order, new byte[] { 0, 1, 2, 4, 5 }, 3, 1));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
@@ -307,7 +307,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
wrappedBuffer(order, new byte[] { 4, 5, 6 }));
b.writeBytes(
wrappedBuffer(order, new byte[] { 7, 8, 9, 10 }));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
@@ -316,7 +316,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 5);
b.writeBytes(
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 6, 5));
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
@@ -325,7 +325,7 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 5);
b.writeBytes(
wrappedBuffer(order, new byte[] { 7, 8, 5, 9, 10 }));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, long length.
a = wrappedBuffer(order, new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
@@ -334,6 +334,6 @@ public abstract class AbstractCompositeChannelBufferTest extends
b.writerIndex(b.writerIndex() - 5);
b.writeBytes(
wrappedBuffer(order, new byte[] { 0, 1, 2, 3, 4, 6, 7, 8, 5, 9, 10, 11 }, 6, 5));
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
}
}
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
index 4c17f4f1c8..b1d884ecd4 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
@@ -21,6 +21,6 @@ package io.netty.buffer;
*/
public class BigEndianCompositeChannelBufferTest extends AbstractCompositeChannelBufferTest {
public BigEndianCompositeChannelBufferTest() {
- super(ChannelBuffers.BIG_ENDIAN);
+ super(ByteBufs.BIG_ENDIAN);
}
}
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
index 424e10ea78..ad47b9705f 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
@@ -28,7 +28,7 @@ public class BigEndianDirectChannelBufferTest extends AbstractChannelBufferTest
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.directBuffer(ByteOrder.BIG_ENDIAN, length);
+ buffer = ByteBufs.directBuffer(ByteOrder.BIG_ENDIAN, length);
assertSame(ByteOrder.BIG_ENDIAN, buffer.order());
assertEquals(0, buffer.writerIndex());
return buffer;
diff --git a/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
index 01a937f85b..ab909d9ce1 100644
--- a/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
@@ -28,7 +28,7 @@ public class BigEndianHeapChannelBufferTest extends AbstractChannelBufferTest {
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.buffer(length);
+ buffer = ByteBufs.buffer(length);
assertEquals(0, buffer.writerIndex());
return buffer;
}
diff --git a/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
index 65ee149472..61b90a9cdd 100644
--- a/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
+++ b/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
@@ -28,7 +28,7 @@ public class ChannelBufferIndexFinderTest {
@Test
public void testForward() {
- ByteBuf buf = ChannelBuffers.copiedBuffer(
+ ByteBuf buf = ByteBufs.copiedBuffer(
"abc\r\n\ndef\r\rghi\n\njkl\0\0mno \t\tx",
CharsetUtil.ISO_8859_1);
@@ -47,7 +47,7 @@ public class ChannelBufferIndexFinderTest {
@Test
public void testBackward() {
- ByteBuf buf = ChannelBuffers.copiedBuffer(
+ ByteBuf buf = ByteBufs.copiedBuffer(
"abc\r\n\ndef\r\rghi\n\njkl\0\0mno \t\tx",
CharsetUtil.ISO_8859_1);
diff --git a/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
index 80efcdc20a..0e07f9c0f9 100644
--- a/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
+++ b/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
@@ -29,7 +29,7 @@ public class ChannelBufferStreamTest {
@Test
public void testAll() throws Exception {
- ByteBuf buf = ChannelBuffers.dynamicBuffer();
+ ByteBuf buf = ByteBufs.dynamicBuffer();
try {
new ByteBufOutputStream(null);
@@ -171,7 +171,7 @@ public class ChannelBufferStreamTest {
@Test
public void testEmptyReadLine() throws Exception {
- ByteBuf buf = ChannelBuffers.buffer(0);
+ ByteBuf buf = ByteBufs.buffer(0);
ByteBufInputStream in = new ByteBufInputStream(buf);
String s = in.readLine();
diff --git a/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java
index f0cefb9c66..5381588ba7 100644
--- a/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java
+++ b/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java
@@ -15,7 +15,7 @@
*/
package io.netty.buffer;
-import static io.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ByteBufs.*;
import static org.junit.Assert.*;
import java.io.InputStream;
@@ -67,7 +67,7 @@ public class ChannelBuffersTest {
for (Entry e: map.entrySet()) {
assertEquals(
e.getValue().intValue(),
- ChannelBuffers.hashCode(wrappedBuffer(e.getKey())));
+ ByteBufs.hashCode(wrappedBuffer(e.getKey())));
}
}
@@ -78,47 +78,47 @@ public class ChannelBuffersTest {
// Different length.
a = wrappedBuffer(new byte[] { 1 });
b = wrappedBuffer(new byte[] { 1, 2 });
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, short length.
a = wrappedBuffer(new byte[] { 1, 2, 3 });
b = wrappedBuffer(new byte[] { 1, 2, 3 });
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, short length.
a = wrappedBuffer(new byte[] { 1, 2, 3 });
b = wrappedBuffer(new byte[] { 0, 1, 2, 3, 4 }, 1, 3);
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, short length.
a = wrappedBuffer(new byte[] { 1, 2, 3 });
b = wrappedBuffer(new byte[] { 1, 2, 4 });
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, short length.
a = wrappedBuffer(new byte[] { 1, 2, 3 });
b = wrappedBuffer(new byte[] { 0, 1, 2, 4, 5 }, 1, 3);
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Same content, same firstIndex, long length.
a = wrappedBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Same content, different firstIndex, long length.
a = wrappedBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 1, 10);
- assertTrue(ChannelBuffers.equals(a, b));
+ assertTrue(ByteBufs.equals(a, b));
// Different content, same firstIndex, long length.
a = wrappedBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(new byte[] { 1, 2, 3, 4, 6, 7, 8, 5, 9, 10 });
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
// Different content, different firstIndex, long length.
a = wrappedBuffer(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
b = wrappedBuffer(new byte[] { 0, 1, 2, 3, 4, 6, 7, 8, 5, 9, 10, 11 }, 1, 10);
- assertFalse(ChannelBuffers.equals(a, b));
+ assertFalse(ByteBufs.equals(a, b));
}
@Test
@@ -197,14 +197,14 @@ public class ChannelBuffersTest {
@Test
public void testCompare2() {
- assertTrue(ChannelBuffers.compare(
- ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}),
- ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}))
+ assertTrue(ByteBufs.compare(
+ ByteBufs.wrappedBuffer(new byte[]{(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}),
+ ByteBufs.wrappedBuffer(new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}))
> 0);
- assertTrue(ChannelBuffers.compare(
- ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF}),
- ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00}))
+ assertTrue(ByteBufs.compare(
+ ByteBufs.wrappedBuffer(new byte[]{(byte) 0xFF}),
+ ByteBufs.wrappedBuffer(new byte[]{(byte) 0x00}))
> 0);
}
@@ -427,7 +427,7 @@ public class ChannelBuffersTest {
@Test
public void testWrapSingleInt() {
- ByteBuf buffer = ChannelBuffers.copyInt(42);
+ ByteBuf buffer = ByteBufs.copyInt(42);
assertEquals(4, buffer.capacity());
assertEquals(42, buffer.readInt());
assertFalse(buffer.readable());
@@ -435,19 +435,19 @@ public class ChannelBuffersTest {
@Test
public void testWrapInt() {
- ByteBuf buffer = ChannelBuffers.copyInt(1, 4);
+ ByteBuf buffer = ByteBufs.copyInt(1, 4);
assertEquals(8, buffer.capacity());
assertEquals(1, buffer.readInt());
assertEquals(4, buffer.readInt());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyInt(null).capacity());
- assertEquals(0, ChannelBuffers.copyInt(new int[0]).capacity());
+ assertEquals(0, ByteBufs.copyInt(null).capacity());
+ assertEquals(0, ByteBufs.copyInt(new int[0]).capacity());
}
@Test
public void testWrapSingleShort() {
- ByteBuf buffer = ChannelBuffers.copyShort(42);
+ ByteBuf buffer = ByteBufs.copyShort(42);
assertEquals(2, buffer.capacity());
assertEquals(42, buffer.readShort());
assertFalse(buffer.readable());
@@ -455,31 +455,31 @@ public class ChannelBuffersTest {
@Test
public void testWrapShortFromShortArray() {
- ByteBuf buffer = ChannelBuffers.copyShort(new short[] { 1, 4 });
+ ByteBuf buffer = ByteBufs.copyShort(new short[] { 1, 4 });
assertEquals(4, buffer.capacity());
assertEquals(1, buffer.readShort());
assertEquals(4, buffer.readShort());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyShort((short[]) null).capacity());
- assertEquals(0, ChannelBuffers.copyShort(new short[0]).capacity());
+ assertEquals(0, ByteBufs.copyShort((short[]) null).capacity());
+ assertEquals(0, ByteBufs.copyShort(new short[0]).capacity());
}
@Test
public void testWrapShortFromIntArray() {
- ByteBuf buffer = ChannelBuffers.copyShort(1, 4);
+ ByteBuf buffer = ByteBufs.copyShort(1, 4);
assertEquals(4, buffer.capacity());
assertEquals(1, buffer.readShort());
assertEquals(4, buffer.readShort());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyShort((int[]) null).capacity());
- assertEquals(0, ChannelBuffers.copyShort(new int[0]).capacity());
+ assertEquals(0, ByteBufs.copyShort((int[]) null).capacity());
+ assertEquals(0, ByteBufs.copyShort(new int[0]).capacity());
}
@Test
public void testWrapSingleMedium() {
- ByteBuf buffer = ChannelBuffers.copyMedium(42);
+ ByteBuf buffer = ByteBufs.copyMedium(42);
assertEquals(3, buffer.capacity());
assertEquals(42, buffer.readMedium());
assertFalse(buffer.readable());
@@ -487,19 +487,19 @@ public class ChannelBuffersTest {
@Test
public void testWrapMedium() {
- ByteBuf buffer = ChannelBuffers.copyMedium(1, 4);
+ ByteBuf buffer = ByteBufs.copyMedium(1, 4);
assertEquals(6, buffer.capacity());
assertEquals(1, buffer.readMedium());
assertEquals(4, buffer.readMedium());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyMedium(null).capacity());
- assertEquals(0, ChannelBuffers.copyMedium(new int[0]).capacity());
+ assertEquals(0, ByteBufs.copyMedium(null).capacity());
+ assertEquals(0, ByteBufs.copyMedium(new int[0]).capacity());
}
@Test
public void testWrapSingleLong() {
- ByteBuf buffer = ChannelBuffers.copyLong(42);
+ ByteBuf buffer = ByteBufs.copyLong(42);
assertEquals(8, buffer.capacity());
assertEquals(42, buffer.readLong());
assertFalse(buffer.readable());
@@ -507,19 +507,19 @@ public class ChannelBuffersTest {
@Test
public void testWrapLong() {
- ByteBuf buffer = ChannelBuffers.copyLong(1, 4);
+ ByteBuf buffer = ByteBufs.copyLong(1, 4);
assertEquals(16, buffer.capacity());
assertEquals(1, buffer.readLong());
assertEquals(4, buffer.readLong());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyLong(null).capacity());
- assertEquals(0, ChannelBuffers.copyLong(new long[0]).capacity());
+ assertEquals(0, ByteBufs.copyLong(null).capacity());
+ assertEquals(0, ByteBufs.copyLong(new long[0]).capacity());
}
@Test
public void testWrapSingleFloat() {
- ByteBuf buffer = ChannelBuffers.copyFloat(42);
+ ByteBuf buffer = ByteBufs.copyFloat(42);
assertEquals(4, buffer.capacity());
assertEquals(42, buffer.readFloat(), 0.01);
assertFalse(buffer.readable());
@@ -527,19 +527,19 @@ public class ChannelBuffersTest {
@Test
public void testWrapFloat() {
- ByteBuf buffer = ChannelBuffers.copyFloat(1, 4);
+ ByteBuf buffer = ByteBufs.copyFloat(1, 4);
assertEquals(8, buffer.capacity());
assertEquals(1, buffer.readFloat(), 0.01);
assertEquals(4, buffer.readFloat(), 0.01);
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyFloat(null).capacity());
- assertEquals(0, ChannelBuffers.copyFloat(new float[0]).capacity());
+ assertEquals(0, ByteBufs.copyFloat(null).capacity());
+ assertEquals(0, ByteBufs.copyFloat(new float[0]).capacity());
}
@Test
public void testWrapSingleDouble() {
- ByteBuf buffer = ChannelBuffers.copyDouble(42);
+ ByteBuf buffer = ByteBufs.copyDouble(42);
assertEquals(8, buffer.capacity());
assertEquals(42, buffer.readDouble(), 0.01);
assertFalse(buffer.readable());
@@ -547,26 +547,26 @@ public class ChannelBuffersTest {
@Test
public void testWrapDouble() {
- ByteBuf buffer = ChannelBuffers.copyDouble(1, 4);
+ ByteBuf buffer = ByteBufs.copyDouble(1, 4);
assertEquals(16, buffer.capacity());
assertEquals(1, buffer.readDouble(), 0.01);
assertEquals(4, buffer.readDouble(), 0.01);
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyDouble(null).capacity());
- assertEquals(0, ChannelBuffers.copyDouble(new double[0]).capacity());
+ assertEquals(0, ByteBufs.copyDouble(null).capacity());
+ assertEquals(0, ByteBufs.copyDouble(new double[0]).capacity());
}
@Test
public void testWrapBoolean() {
- ByteBuf buffer = ChannelBuffers.copyBoolean(true, false);
+ ByteBuf buffer = ByteBufs.copyBoolean(true, false);
assertEquals(2, buffer.capacity());
assertEquals(true, buffer.readBoolean());
assertEquals(false, buffer.readBoolean());
assertFalse(buffer.readable());
- assertEquals(0, ChannelBuffers.copyBoolean(null).capacity());
- assertEquals(0, ChannelBuffers.copyBoolean(new boolean[0]).capacity());
+ assertEquals(0, ByteBufs.copyBoolean(null).capacity());
+ assertEquals(0, ByteBufs.copyBoolean(new boolean[0]).capacity());
}
}
diff --git a/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
index 94e0d2baea..1924d5479b 100644
--- a/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
@@ -28,7 +28,7 @@ public class DuplicateChannelBufferTest extends AbstractChannelBufferTest {
@Override
protected ByteBuf newBuffer(int length) {
- buffer = new DuplicatedByteBuf(ChannelBuffers.buffer(length));
+ buffer = new DuplicatedByteBuf(ByteBufs.buffer(length));
assertEquals(0, buffer.writerIndex());
return buffer;
}
diff --git a/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
index d2b30ec3f9..028929041b 100644
--- a/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
@@ -30,7 +30,7 @@ public class DynamicChannelBufferTest extends AbstractChannelBufferTest {
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.dynamicBuffer(length);
+ buffer = ByteBufs.dynamicBuffer(length);
assertEquals(0, buffer.readerIndex());
assertEquals(0, buffer.writerIndex());
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
index aec1d480de..f055a879a2 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
@@ -21,6 +21,6 @@ package io.netty.buffer;
*/
public class LittleEndianCompositeChannelBufferTest extends AbstractCompositeChannelBufferTest {
public LittleEndianCompositeChannelBufferTest() {
- super(ChannelBuffers.LITTLE_ENDIAN);
+ super(ByteBufs.LITTLE_ENDIAN);
}
}
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
index 4584cadb17..4472faacf1 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
@@ -28,7 +28,7 @@ public class LittleEndianDirectChannelBufferTest extends AbstractChannelBufferTe
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, length);
+ buffer = ByteBufs.directBuffer(ByteOrder.LITTLE_ENDIAN, length);
assertSame(ByteOrder.LITTLE_ENDIAN, buffer.order());
assertEquals(0, buffer.writerIndex());
return buffer;
diff --git a/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
index 84d09b1d13..5f1efc77ae 100644
--- a/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
@@ -30,7 +30,7 @@ public class LittleEndianHeapChannelBufferTest extends AbstractChannelBufferTest
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.buffer(ByteOrder.LITTLE_ENDIAN, length);
+ buffer = ByteBufs.buffer(ByteOrder.LITTLE_ENDIAN, length);
assertEquals(0, buffer.writerIndex());
return buffer;
}
diff --git a/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
index b9a278ad18..8888cc8bb0 100644
--- a/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
@@ -15,7 +15,7 @@
*/
package io.netty.buffer;
-import static io.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ByteBufs.*;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -40,24 +40,24 @@ public class ReadOnlyChannelBufferTest {
@Test
public void testUnmodifiableBuffer() {
- assertTrue(ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1)) instanceof ReadOnlyByteBuf);
+ assertTrue(ByteBufs.unmodifiableBuffer(ByteBufs.buffer(1)) instanceof ReadOnlyByteBuf);
}
@Test
public void testUnwrap() {
- ByteBuf buf = ChannelBuffers.buffer(1);
- assertSame(buf, ((WrappedByteBuf) ChannelBuffers.unmodifiableBuffer(buf)).unwrap());
+ ByteBuf buf = ByteBufs.buffer(1);
+ assertSame(buf, ((WrappedByteBuf) ByteBufs.unmodifiableBuffer(buf)).unwrap());
}
@Test
public void shouldHaveSameByteOrder() {
- ByteBuf buf = ChannelBuffers.buffer(ChannelBuffers.LITTLE_ENDIAN, 1);
- assertSame(ChannelBuffers.LITTLE_ENDIAN, ChannelBuffers.unmodifiableBuffer(buf).order());
+ ByteBuf buf = ByteBufs.buffer(ByteBufs.LITTLE_ENDIAN, 1);
+ assertSame(ByteBufs.LITTLE_ENDIAN, ByteBufs.unmodifiableBuffer(buf).order());
}
@Test
public void shouldReturnReadOnlyDerivedBuffer() {
- ByteBuf buf = ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1));
+ ByteBuf buf = ByteBufs.unmodifiableBuffer(ByteBufs.buffer(1));
assertTrue(buf.duplicate() instanceof ReadOnlyByteBuf);
assertTrue(buf.slice() instanceof ReadOnlyByteBuf);
assertTrue(buf.slice(0, 1) instanceof ReadOnlyByteBuf);
@@ -66,7 +66,7 @@ public class ReadOnlyChannelBufferTest {
@Test
public void shouldReturnWritableCopy() {
- ByteBuf buf = ChannelBuffers.unmodifiableBuffer(ChannelBuffers.buffer(1));
+ ByteBuf buf = ByteBufs.unmodifiableBuffer(ByteBufs.buffer(1));
assertFalse(buf.copy() instanceof ReadOnlyByteBuf);
}
diff --git a/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
index cccb7624d5..2c706e07de 100644
--- a/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
@@ -31,7 +31,7 @@ public class SlicedChannelBufferTest extends AbstractChannelBufferTest {
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.wrappedBuffer(
+ buffer = ByteBufs.wrappedBuffer(
new byte[length * 2], random.nextInt(length - 1) + 1, length);
assertEquals(length, buffer.writerIndex());
return buffer;
diff --git a/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
index 0533cf7ad9..297e350702 100644
--- a/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
+++ b/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
@@ -28,7 +28,7 @@ public class TruncatedChannelBufferTest extends AbstractChannelBufferTest {
@Override
protected ByteBuf newBuffer(int length) {
- buffer = ChannelBuffers.wrappedBuffer(
+ buffer = ByteBufs.wrappedBuffer(
new byte[length * 2], 0, length);
assertEquals(length, buffer.writerIndex());
return buffer;
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
index 5241e21b2b..7bdf5e382a 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import java.util.List;
import java.util.Map;
@@ -97,7 +97,7 @@ public class DefaultHttpChunkTrailer implements HttpChunkTrailer {
@Override
public ByteBuf getContent() {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
@Override
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
index ff861ac041..ff256c255e 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.util.internal.StringUtil;
import java.util.List;
@@ -30,7 +30,7 @@ public class DefaultHttpMessage implements HttpMessage {
private final HttpHeaders headers = new HttpHeaders();
private HttpVersion version;
- private ByteBuf content = ChannelBuffers.EMPTY_BUFFER;
+ private ByteBuf content = ByteBufs.EMPTY_BUFFER;
private boolean chunked;
/**
@@ -73,7 +73,7 @@ public class DefaultHttpMessage implements HttpMessage {
public void setChunked(boolean chunked) {
this.chunked = chunked;
if (chunked) {
- setContent(ChannelBuffers.EMPTY_BUFFER);
+ setContent(ByteBufs.EMPTY_BUFFER);
}
}
@@ -85,7 +85,7 @@ public class DefaultHttpMessage implements HttpMessage {
@Override
public void setContent(ByteBuf content) {
if (content == null) {
- content = ChannelBuffers.EMPTY_BUFFER;
+ content = ByteBufs.EMPTY_BUFFER;
}
if (content.readable() && isChunked()) {
throw new IllegalArgumentException(
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java
index 775fd61fee..addf193222 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.channel.ChannelPipeline;
import java.util.Collections;
@@ -41,7 +41,7 @@ public interface HttpChunk {
HttpChunkTrailer LAST_CHUNK = new HttpChunkTrailer() {
@Override
public ByteBuf getContent() {
- return ChannelBuffers.EMPTY_BUFFER;
+ return ByteBufs.EMPTY_BUFFER;
}
@Override
@@ -113,7 +113,7 @@ public interface HttpChunk {
/**
* Returns the content of this chunk. If this is the 'end of content'
- * marker, {@link ChannelBuffers#EMPTY_BUFFER} will be returned.
+ * marker, {@link ByteBufs#EMPTY_BUFFER} will be returned.
*/
ByteBuf getContent();
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
index 41c93a8bad..5498e8c5ce 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
@@ -17,7 +17,7 @@ package io.netty.handler.codec.http;
import static io.netty.handler.codec.http.HttpHeaders.*;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
@@ -48,7 +48,7 @@ import java.util.Map.Entry;
*/
public class HttpChunkAggregator extends MessageToMessageDecoder {
- private static final ByteBuf CONTINUE = ChannelBuffers.copiedBuffer(
+ private static final ByteBuf CONTINUE = ByteBufs.copiedBuffer(
"HTTP/1.1 100 Continue\r\n\r\n", CharsetUtil.US_ASCII);
private final int maxContentLength;
@@ -101,7 +101,7 @@ public class HttpChunkAggregator extends MessageToMessageDecoder
* If this method is called with {@code true}, the content of this message
- * becomes {@link ChannelBuffers#EMPTY_BUFFER}.
+ * becomes {@link ByteBufs#EMPTY_BUFFER}.
*
* Even if this method is called with {@code false}, {@link #isChunked()}
* will keep returning {@code true} if the {@code "Transfer-Encoding"} of
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
index 6741c7ac0a..077576e4a6 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.ReplayingDecoder;
@@ -204,7 +204,7 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder 0) {
binaryData.writeBytes(reasonBytes);
@@ -102,7 +102,7 @@ public class CloseWebSocketFrame extends WebSocketFrame {
setFinalFragment(finalFragment);
setRsv(rsv);
if (binaryData == null) {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
} else {
setBinaryData(binaryData);
}
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
index 327c1a002b..c64b2b609c 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.util.CharsetUtil;
/**
@@ -31,7 +31,7 @@ public class ContinuationWebSocketFrame extends WebSocketFrame {
* Creates a new empty continuation frame.
*/
public ContinuationWebSocketFrame() {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
}
/**
@@ -115,9 +115,9 @@ public class ContinuationWebSocketFrame extends WebSocketFrame {
*/
public void setText(String text) {
if (text == null || text.isEmpty()) {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
} else {
- setBinaryData(ChannelBuffers.copiedBuffer(text, CharsetUtil.UTF_8));
+ setBinaryData(ByteBufs.copiedBuffer(text, CharsetUtil.UTF_8));
}
}
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
index d06515e057..44bf700ba3 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
/**
* Web Socket frame containing binary data
@@ -28,7 +28,7 @@ public class PingWebSocketFrame extends WebSocketFrame {
*/
public PingWebSocketFrame() {
setFinalFragment(true);
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
}
/**
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
index a443c0d4f4..81c0e9dfe5 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
/**
* Web Socket frame containing binary data
@@ -27,7 +27,7 @@ public class PongWebSocketFrame extends WebSocketFrame {
* Creates a new empty pong frame.
*/
public PongWebSocketFrame() {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
}
/**
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
index 029208b645..b37b5f57d8 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.util.CharsetUtil;
/**
@@ -28,7 +28,7 @@ public class TextWebSocketFrame extends WebSocketFrame {
* Creates a new empty text frame.
*/
public TextWebSocketFrame() {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
}
/**
@@ -39,9 +39,9 @@ public class TextWebSocketFrame extends WebSocketFrame {
*/
public TextWebSocketFrame(String text) {
if (text == null || text.isEmpty()) {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
} else {
- setBinaryData(ChannelBuffers.copiedBuffer(text, CharsetUtil.UTF_8));
+ setBinaryData(ByteBufs.copiedBuffer(text, CharsetUtil.UTF_8));
}
}
@@ -69,9 +69,9 @@ public class TextWebSocketFrame extends WebSocketFrame {
setFinalFragment(finalFragment);
setRsv(rsv);
if (text == null || text.isEmpty()) {
- setBinaryData(ChannelBuffers.EMPTY_BUFFER);
+ setBinaryData(ByteBufs.EMPTY_BUFFER);
} else {
- setBinaryData(ChannelBuffers.copiedBuffer(text, CharsetUtil.UTF_8));
+ setBinaryData(ByteBufs.copiedBuffer(text, CharsetUtil.UTF_8));
}
}
@@ -111,7 +111,7 @@ public class TextWebSocketFrame extends WebSocketFrame {
if (text == null) {
throw new NullPointerException("text");
}
- setBinaryData(ChannelBuffers.copiedBuffer(text, CharsetUtil.UTF_8));
+ setBinaryData(ByteBufs.copiedBuffer(text, CharsetUtil.UTF_8));
}
@Override
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
index 758061acbe..314c71fbd2 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
@@ -54,7 +54,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.CorruptedFrameException;
@@ -257,7 +257,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder SpdyCodecUtil.SPDY_MAX_LENGTH) {
throw new IllegalArgumentException("data payload cannot exceed "
diff --git a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyDataFrame.java b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyDataFrame.java
index d3927bcc20..513fa1e4c5 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyDataFrame.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyDataFrame.java
@@ -16,7 +16,7 @@
package io.netty.handler.codec.spdy;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
/**
* A SPDY Protocol Data Frame
@@ -58,13 +58,13 @@ public interface SpdyDataFrame {
/**
* Returns the data payload of this frame. If there is no data payload
- * {@link ChannelBuffers#EMPTY_BUFFER} is returned.
+ * {@link ByteBufs#EMPTY_BUFFER} is returned.
*/
ByteBuf getData();
/**
* Sets the data payload of this frame. If {@code null} is specified,
- * the data payload will be set to {@link ChannelBuffers#EMPTY_BUFFER}.
+ * the data payload will be set to {@link ByteBufs#EMPTY_BUFFER}.
* The data payload cannot exceed 16777215 bytes.
*/
void setData(ByteBuf data);
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 7706d6d4a9..477a830133 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
@@ -17,7 +17,7 @@ package io.netty.handler.codec.spdy;
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBufs;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.TooLongFrameException;
@@ -554,7 +554,7 @@ public class SpdyFrameDecoder extends ByteToMessageDecoder