You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/10/02 15:39:53 UTC
svn commit: r581234 [3/3] - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/filter/codec/demux/
core/src/main/java/org/apache/mina/filter/codec/serialization...
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java Tue Oct 2 06:39:48 2007
@@ -23,7 +23,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.sumup.message.AbstractMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
@@ -50,7 +50,7 @@
@Override
protected void encodeBody(IoSession session, AbstractMessage message,
- ByteBuffer out) {
+ IoBuffer out) {
ResultMessage m = (ResultMessage) message;
if (m.isOk()) {
out.putShort((short) Constants.RESULT_OK);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import java.net.SocketAddress;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
@@ -52,8 +52,8 @@
public void messageReceived(IoSession session, Object message)
throws Exception {
- if (message instanceof ByteBuffer) {
- ByteBuffer buffer = (ByteBuffer) message;
+ if (message instanceof IoBuffer) {
+ IoBuffer buffer = (IoBuffer) message;
SocketAddress remoteAddress = session.getRemoteAddress();
server.recvUpdate(remoteAddress, buffer.getLong());
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoConnector;
@@ -89,7 +89,7 @@
private void sendData() throws InterruptedException {
for (int i = 0; i < 30; i++) {
long free = Runtime.getRuntime().freeMemory();
- ByteBuffer buffer = ByteBuffer.allocate(8);
+ IoBuffer buffer = IoBuffer.allocate(8);
buffer.putLong(free);
buffer.flip();
session.write(buffer);
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Tue Oct 2 06:39:48 2007
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionLogger;
@@ -59,7 +59,7 @@
assertEquals(toString(expected), toString(actual));
}
- protected static void assertEquals(ByteBuffer expected, ByteBuffer actual) {
+ protected static void assertEquals(IoBuffer expected, IoBuffer actual) {
assertEquals(toString(expected), toString(actual));
}
@@ -72,7 +72,7 @@
return str.toString();
}
- protected static String toString(ByteBuffer buf) {
+ protected static String toString(IoBuffer buf) {
return buf.getHexDump();
}
@@ -121,11 +121,11 @@
@Override
public void messageReceived(IoSession session,
Object message) throws Exception {
- if (!(message instanceof ByteBuffer)) {
+ if (!(message instanceof IoBuffer)) {
return;
}
- ByteBuffer buf = (ByteBuffer) message;
+ IoBuffer buf = (IoBuffer) message;
if (session.getFilterChain().contains("SSL")
&& buf.remaining() == 1
&& buf.get() == (byte) '.') {
@@ -134,7 +134,7 @@
.startSsl(session);
// Send a response
- buf = ByteBuffer.allocate(1);
+ buf = IoBuffer.allocate(1);
buf.put((byte) '.');
buf.flip();
session
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Tue Oct 2 06:39:48 2007
@@ -23,7 +23,7 @@
import junit.framework.Assert;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandlerAdapter;
@@ -144,7 +144,7 @@
// Test if we can enter TLS mode again.
//// Send StartTLS request.
handler.readBuf.clear();
- ByteBuffer buf = ByteBuffer.allocate(1);
+ IoBuffer buf = IoBuffer.allocate(1);
buf.put((byte) '.');
buf.flip();
session.write(buf).awaitUninterruptibly();
@@ -167,11 +167,11 @@
private void testConnector0(IoSession session) throws InterruptedException {
EchoConnectorHandler handler = (EchoConnectorHandler) session
.getHandler();
- ByteBuffer readBuf = handler.readBuf;
+ IoBuffer readBuf = handler.readBuf;
readBuf.clear();
WriteFuture writeFuture = null;
for (int i = 0; i < COUNT; i++) {
- ByteBuffer buf = ByteBuffer.allocate(DATA_SIZE);
+ IoBuffer buf = IoBuffer.allocate(DATA_SIZE);
buf.limit(DATA_SIZE);
fillWriteBuffer(buf, i);
buf.flip();
@@ -195,7 +195,7 @@
readBuf.flip();
IoSessionLogger.info(session, "readBuf: " + readBuf);
Assert.assertEquals(DATA_SIZE * COUNT, readBuf.remaining());
- ByteBuffer expectedBuf = ByteBuffer.allocate(DATA_SIZE * COUNT);
+ IoBuffer expectedBuf = IoBuffer.allocate(DATA_SIZE * COUNT);
for (int i = 0; i < COUNT; i++) {
expectedBuf.limit((i + 1) * DATA_SIZE);
fillWriteBuffer(expectedBuf, i);
@@ -217,7 +217,7 @@
Assert.assertEquals(bytes, handler.readBuf.position());
}
- private void fillWriteBuffer(ByteBuffer writeBuf, int i) {
+ private void fillWriteBuffer(IoBuffer writeBuf, int i) {
while (writeBuf.remaining() > 0) {
writeBuf.put((byte) i++);
}
@@ -228,7 +228,7 @@
}
private static class EchoConnectorHandler extends IoHandlerAdapter {
- private final ByteBuffer readBuf = ByteBuffer.allocate(1024);
+ private final IoBuffer readBuf = IoBuffer.allocate(1024);
private EchoConnectorHandler() {
readBuf.setAutoExpand(true);
@@ -236,7 +236,7 @@
@Override
public void messageReceived(IoSession session, Object message) {
- readBuf.put((ByteBuffer) message);
+ readBuf.put((IoBuffer) message);
}
@Override
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpDecoder.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.nio.charset.CharsetDecoder;
import java.util.Date;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
/**
* TODO HttpDecoder.
@@ -65,7 +65,7 @@
private CharsetDecoder decoder = Charset.defaultCharset().newDecoder();
- public String decodeLine(ByteBuffer in) throws Exception {
+ public String decodeLine(IoBuffer in) throws Exception {
int beginPos = in.position();
int limit = in.limit();
boolean lastIsCR = false;
@@ -90,7 +90,7 @@
String result = null;
if (terminatorPos > 1) {
- ByteBuffer line = in.slice();
+ IoBuffer line = in.slice();
line.limit(terminatorPos - beginPos - 1);
result = line.getString(decoder);
}
@@ -153,14 +153,14 @@
return Integer.parseInt(strippedLine, 16);
}
- public void decodeContent(ByteBuffer in, HttpResponseMessage msg)
+ public void decodeContent(IoBuffer in, HttpResponseMessage msg)
throws Exception {
byte content[] = new byte[msg.getContentLength()];
in.get(content);
msg.addContent(content);
}
- public void decodeChunkedContent(ByteBuffer in, HttpResponseMessage msg)
+ public void decodeChunkedContent(IoBuffer in, HttpResponseMessage msg)
throws Exception {
int toRead = msg.getExpectedToRead();
if ((in.get(in.position() + toRead) != CR)
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestEncoder.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
@@ -53,7 +53,7 @@
ProtocolEncoderOutput out) throws Exception {
HttpRequestMessage msg = (HttpRequestMessage) message;
- ByteBuffer buf = ByteBuffer.allocate(256);
+ IoBuffer buf = IoBuffer.allocate(256);
// Enable auto-expand for easier encoding
buf.setAutoExpand(true);
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.http;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
@@ -38,7 +38,7 @@
private HttpDecoder httpDecoder = new HttpDecoder();
- protected boolean doDecode(IoSession ioSession, ByteBuffer in,
+ protected boolean doDecode(IoSession ioSession, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
HttpResponseMessage response = (HttpResponseMessage) ioSession.getAttribute(CURRENT_RESPONSE);
@@ -117,7 +117,7 @@
}
}
- private boolean processHeaders(HttpResponseMessage response, ByteBuffer in)
+ private boolean processHeaders(HttpResponseMessage response, IoBuffer in)
throws Exception {
if (!findHeaders(response, in))
return false;
@@ -126,7 +126,7 @@
return true;
}
- private boolean processFooters(HttpResponseMessage response, ByteBuffer in)
+ private boolean processFooters(HttpResponseMessage response, IoBuffer in)
throws Exception {
if (!findHeaders(response, in))
return false;
@@ -135,7 +135,7 @@
return true;
}
- private boolean findHeaders(HttpResponseMessage response, ByteBuffer in)
+ private boolean findHeaders(HttpResponseMessage response, IoBuffer in)
throws Exception {
//Read the headers and process them
while (true) {
@@ -155,7 +155,7 @@
return true;
}
- private boolean processContent(HttpResponseMessage response, ByteBuffer in)
+ private boolean processContent(HttpResponseMessage response, IoBuffer in)
throws Exception {
if (response.isChunked()) {
while (true) {
@@ -211,7 +211,7 @@
session.removeAttribute(CURRENT_RESPONSE);
}
- private boolean processStatus(HttpResponseMessage response, ByteBuffer in)
+ private boolean processStatus(HttpResponseMessage response, IoBuffer in)
throws Exception {
//Read the status header
String header = httpDecoder.decodeLine(in);
Modified: mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java (original)
+++ mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java Tue Oct 2 06:39:48 2007
@@ -23,7 +23,7 @@
import net.gleamynode.netty2.MessageParseException;
import net.gleamynode.netty2.MessageRecognizer;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderAdapter;
@@ -55,7 +55,7 @@
this.recognizer = recognizer;
}
- private void put(ByteBuffer in) {
+ private void put(IoBuffer in) {
// copy to read buffer
if (in.remaining() > readBuf.remaining()) {
expand((readBuf.position() + in.remaining()) * 3 / 2);
@@ -70,7 +70,7 @@
readBuf = newBuf;
}
- public void decode(IoSession session, ByteBuffer in,
+ public void decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
put(in);
Modified: mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java (original)
+++ mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import net.gleamynode.netty2.Message;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderException;
@@ -49,7 +49,7 @@
}
for (;;) {
- ByteBuffer buf = ByteBuffer.allocate(8192);
+ IoBuffer buf = IoBuffer.allocate(8192);
Message m = (Message) message;
try {
if (m.write(buf.buf())) {
Modified: mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java (original)
+++ mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterChain;
@@ -153,8 +153,8 @@
throw new IllegalStateException();
}
- ByteBuffer inBuffer = (ByteBuffer) message;
- ByteBuffer outBuffer = inflater.inflate(inBuffer);
+ IoBuffer inBuffer = (IoBuffer) message;
+ IoBuffer outBuffer = inflater.inflate(inBuffer);
nextFilter.messageReceived(session, outBuffer);
}
@@ -180,7 +180,7 @@
throw new IllegalStateException();
}
- ByteBuffer inBuffer = (ByteBuffer) writeRequest.getMessage();
+ IoBuffer inBuffer = (IoBuffer) writeRequest.getMessage();
if (!inBuffer.hasRemaining()) {
// Ignore empty buffers
return null;
Modified: mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java (original)
+++ mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import com.jcraft.jzlib.JZlib;
import com.jcraft.jzlib.ZStream;
@@ -88,13 +88,13 @@
}
/**
- * @param inBuffer the {@link ByteBuffer} to be decompressed. The contents
+ * @param inBuffer the {@link IoBuffer} to be decompressed. The contents
* of the buffer are transferred into a local byte array and the buffer is
* flipped and returned intact.
* @return the decompressed data
* @throws IOException if the decompression of the data failed for some reason.
*/
- public ByteBuffer inflate(ByteBuffer inBuffer) throws IOException {
+ public IoBuffer inflate(IoBuffer inBuffer) throws IOException {
if (mode == MODE_DEFLATER) {
throw new IllegalStateException("not initialized as INFLATER");
}
@@ -103,7 +103,7 @@
inBuffer.get(inBytes).flip();
byte[] outBytes = new byte[inBytes.length * 2];
- ByteBuffer outBuffer = ByteBuffer.allocate(outBytes.length);
+ IoBuffer outBuffer = IoBuffer.allocate(outBytes.length);
outBuffer.setAutoExpand(true);
zStream.next_in = inBytes;
@@ -147,7 +147,7 @@
* @return the buffer with the compressed data
* @throws IOException if the compression of teh buffer failed for some reason
*/
- public ByteBuffer deflate(ByteBuffer inBuffer) throws IOException {
+ public IoBuffer deflate(IoBuffer inBuffer) throws IOException {
if (mode == MODE_INFLATER) {
throw new IllegalStateException("not initialized as DEFLATER");
}
@@ -176,7 +176,7 @@
+ retval);
}
- ByteBuffer outBuf = ByteBuffer
+ IoBuffer outBuf = IoBuffer
.wrap(outBytes, 0, zStream.next_out_index);
return outBuf;
Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
@@ -112,8 +112,8 @@
public void testCompression() throws Exception {
// prepare the input data
- ByteBuffer buf = ByteBuffer.wrap(strCompress.getBytes("UTF8"));
- ByteBuffer actualOutput = actualDeflater.deflate(buf);
+ IoBuffer buf = IoBuffer.wrap(strCompress.getBytes("UTF8"));
+ IoBuffer actualOutput = actualDeflater.deflate(buf);
WriteRequest writeRequest = new DefaultWriteRequest(buf);
// record all the mock calls
@@ -157,9 +157,9 @@
public void testDecompression() throws Exception {
// prepare the input data
- ByteBuffer buf = ByteBuffer.wrap(strCompress.getBytes("UTF8"));
- ByteBuffer byteInput = actualDeflater.deflate(buf);
- ByteBuffer actualOutput = actualInflater.inflate(byteInput);
+ IoBuffer buf = IoBuffer.wrap(strCompress.getBytes("UTF8"));
+ IoBuffer byteInput = actualDeflater.deflate(buf);
+ IoBuffer actualOutput = actualInflater.inflate(byteInput);
// record all the mock calls
ioFilterChain.contains(CompressionFilter.class);
@@ -209,8 +209,8 @@
if (arg0 instanceof WriteRequest) {
WriteRequest expected = (WriteRequest) arg0;
WriteRequest actual = (WriteRequest) arg1;
- ByteBuffer bExpected = (ByteBuffer) expected.getMessage();
- ByteBuffer bActual = (ByteBuffer) actual.getMessage();
+ IoBuffer bExpected = (IoBuffer) expected.getMessage();
+ IoBuffer bActual = (IoBuffer) actual.getMessage();
return bExpected.equals(bActual);
}
return true;
Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
/**
* @author The Apache MINA Project (dev@mina.apache.org)
@@ -49,13 +49,13 @@
for (int i = 0; i < 10; i++) {
strInput += "The quick brown fox jumps over the lazy dog. ";
}
- ByteBuffer byteInput = ByteBuffer.wrap(strInput.getBytes("UTF8"));
+ IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
// increase the count to have the compression and decompression
// done using the same instance of Zlib
for (int i = 0; i < 5; i++) {
- ByteBuffer byteCompressed = deflater.deflate(byteInput);
- ByteBuffer byteUncompressed = inflater.inflate(byteCompressed);
+ IoBuffer byteCompressed = deflater.deflate(byteInput);
+ IoBuffer byteUncompressed = inflater.inflate(byteCompressed);
String strOutput = byteUncompressed.getString(Charset.forName(
"UTF8").newDecoder());
assertTrue(strOutput.equals(strInput));
@@ -64,13 +64,13 @@
public void testCorruptedData() throws Exception {
String strInput = "Hello World";
- ByteBuffer byteInput = ByteBuffer.wrap(strInput.getBytes("UTF8"));
+ IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
- ByteBuffer byteCompressed = deflater.deflate(byteInput);
+ IoBuffer byteCompressed = deflater.deflate(byteInput);
// change the contents to something else. Since this doesn't check
// for integrity, it wont throw an exception
byteCompressed.put(5, (byte) 0xa);
- ByteBuffer byteUncompressed = inflater.inflate(byteCompressed);
+ IoBuffer byteUncompressed = inflater.inflate(byteCompressed);
String strOutput = byteUncompressed.getString(Charset.forName("UTF8")
.newDecoder());
assertFalse(strOutput.equals(strInput));
@@ -78,9 +78,9 @@
public void testCorruptedHeader() throws Exception {
String strInput = "Hello World";
- ByteBuffer byteInput = ByteBuffer.wrap(strInput.getBytes("UTF8"));
+ IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
- ByteBuffer byteCompressed = deflater.deflate(byteInput);
+ IoBuffer byteCompressed = deflater.deflate(byteInput);
// write a bad value into the zlib header. Make sure that
// the decompression fails
byteCompressed.put(0, (byte) 0xca);
@@ -98,8 +98,8 @@
for (int i = 0; i < 10; i++) {
strInput += "The quick brown fox jumps over the lazy dog. ";
}
- ByteBuffer byteInput = ByteBuffer.wrap(strInput.getBytes("UTF8"));
- ByteBuffer byteCompressed = null;
+ IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
+ IoBuffer byteCompressed = null;
for (int i = 0; i < 5; i++) {
byteCompressed = deflater.deflate(byteInput);
@@ -107,7 +107,7 @@
// decompress the first compressed output since it contains
// the zlib header, which will not be generated for further
// compressions done with the same instance
- ByteBuffer byteUncompressed = inflater.inflate(byteCompressed);
+ IoBuffer byteUncompressed = inflater.inflate(byteCompressed);
String strOutput = byteUncompressed.getString(Charset.forName(
"UTF8").newDecoder());
assertTrue(strOutput.equals(strInput));
@@ -115,7 +115,7 @@
}
// check if the last compressed data block can be decompressed
// successfully.
- ByteBuffer byteUncompressed = inflater.inflate(byteCompressed);
+ IoBuffer byteUncompressed = inflater.inflate(byteCompressed);
String strOutput = byteUncompressed.getString(Charset.forName("UTF8")
.newDecoder());
assertTrue(strOutput.equals(strInput));
Modified: mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java (original)
+++ mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java Tue Oct 2 06:39:48 2007
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.http.HttpResponseDecoder;
import org.apache.mina.filter.codec.http.HttpResponseMessage;
@@ -43,7 +43,7 @@
+ "Content-Type: text/plain\r\n" + "\r\n" + fakeHttp;
public void testChunking() throws Exception {
- ByteBuffer buffer = ByteBuffer.allocate(fakeHttp.length());
+ IoBuffer buffer = IoBuffer.allocate(fakeHttp.length());
buffer.put(fakeHttp.getBytes());
buffer.flip();
@@ -58,7 +58,7 @@
}
public void testChunkingContinue() throws Exception {
- ByteBuffer buffer = ByteBuffer.allocate(fakeHttpContinue.length());
+ IoBuffer buffer = IoBuffer.allocate(fakeHttpContinue.length());
buffer.put(fakeHttp.getBytes());
buffer.flip();
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import org.apache.mina.common.AbstractIoProcessor;
import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.FileRegion;
import org.apache.mina.common.IoSession;
import org.apache.tomcat.jni.Error;
@@ -217,7 +217,7 @@
}
@Override
- protected int read(IoSession sess, ByteBuffer buffer) throws Exception {
+ protected int read(IoSession sess, IoBuffer buffer) throws Exception {
logger.debug("read");
AprSessionImpl session=(AprSessionImpl)sess;
@@ -326,7 +326,7 @@
}
@Override
- protected int write(IoSession session, ByteBuffer buf) throws Exception {
+ protected int write(IoSession session, IoBuffer buf) throws Exception {
logger.debug("write");
// be sure APR_SO_NONBLOCK was set, or it will block
int toWrite = buf.remaining();
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.net.InetSocketAddress;
import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultIoFilterChain;
import org.apache.mina.common.DefaultTransportMetadata;
import org.apache.mina.common.IoFilterChain;
@@ -59,7 +59,7 @@
static final TransportMetadata METADATA = new DefaultTransportMetadata(
"Apache Portable Runtime socket", false, true,
- InetSocketAddress.class, AprSessionConfig.class, ByteBuffer.class);
+ InetSocketAddress.class, AprSessionConfig.class, IoBuffer.class);
private boolean isOpRead=false;
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java Tue Oct 2 06:39:48 2007
@@ -29,7 +29,7 @@
import java.util.TooManyListenersException;
import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultIoFilterChain;
import org.apache.mina.common.DefaultTransportMetadata;
import org.apache.mina.common.ExceptionMonitor;
@@ -74,7 +74,7 @@
static final TransportMetadata METADATA =
new DefaultTransportMetadata(
"serial", false, true, SerialAddress.class,
- SerialSessionConfig.class, ByteBuffer.class);
+ SerialSessionConfig.class, IoBuffer.class);
SerialSessionImpl(IoService service, SerialAddress address, SerialPort port) {
this.service = service;
@@ -165,7 +165,7 @@
break;
}
- ByteBuffer buf = (ByteBuffer) req.getMessage();
+ IoBuffer buf = (IoBuffer) req.getMessage();
if (buf.remaining() == 0) {
getWriteRequestQueue().poll();
buf.reset();
@@ -206,7 +206,7 @@
int readBytes = inputStream.read(data);
if (readBytes > 0) {
- ByteBuffer buf = ByteBuffer
+ IoBuffer buf = IoBuffer
.wrap(data, 0, readBytes);
buf.put(data, 0, readBytes);
buf.flip();