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 [2/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/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java Tue Oct 2 06:39:48 2007
@@ -19,12 +19,12 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.WriteFuture;
/**
- * Callback for {@link ProtocolEncoder} to generate encoded {@link ByteBuffer}s.
- * {@link ProtocolEncoder} must call {@link #write(ByteBuffer)} for each encoded
+ * Callback for {@link ProtocolEncoder} to generate encoded {@link IoBuffer}s.
+ * {@link ProtocolEncoder} must call {@link #write(IoBuffer)} for each encoded
* message.
*
* @author The Apache MINA Project (dev@mina.apache.org)
@@ -33,23 +33,23 @@
public interface ProtocolEncoderOutput {
/**
* Callback for {@link ProtocolEncoder} to generate encoded
- * {@link ByteBuffer}s. {@link ProtocolEncoder} must call
- * {@link #write(ByteBuffer)} for each encoded message.
+ * {@link IoBuffer}s. {@link ProtocolEncoder} must call
+ * {@link #write(IoBuffer)} for each encoded message.
*
* @param buf the buffer which contains encoded data
*/
- void write(ByteBuffer buf);
+ void write(IoBuffer buf);
/**
- * Merges all buffers you wrote via {@link #write(ByteBuffer)} into
- * one {@link ByteBuffer} and replaces the old fragmented ones with it.
+ * Merges all buffers you wrote via {@link #write(IoBuffer)} into
+ * one {@link IoBuffer} and replaces the old fragmented ones with it.
* This method is useful when you want to control the way MINA generates
* network packets.
*/
void mergeAll();
/**
- * Flushes all buffers you wrote via {@link #write(ByteBuffer)} to
+ * Flushes all buffers you wrote via {@link #write(IoBuffer)} to
* the session. This operation is asynchronous; please wait for
* the returned {@link WriteFuture} if you want to wait for
* the buffers flushed.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
/**
@@ -54,7 +54,7 @@
return decoder;
}
- public void decode(IoSession session, ByteBuffer in,
+ public void decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
synchronized (decoder) {
decoder.decode(session, in, out);
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,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.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -249,7 +249,7 @@
}
@Override
- protected boolean doDecode(IoSession session, ByteBuffer in,
+ protected boolean doDecode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
if (currentDecoder == null) {
MessageDecoder[] decoders = this.decoders;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -34,22 +34,22 @@
*/
public interface MessageDecoder {
/**
- * Represents a result from {@link #decodable(IoSession, ByteBuffer)} and
- * {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}. Please
+ * Represents a result from {@link #decodable(IoSession, IoBuffer)} and
+ * {@link #decode(IoSession, IoBuffer, ProtocolDecoderOutput)}. Please
* refer to each method's documentation for detailed explanation.
*/
static MessageDecoderResult OK = MessageDecoderResult.OK;
/**
- * Represents a result from {@link #decodable(IoSession, ByteBuffer)} and
- * {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}. Please
+ * Represents a result from {@link #decodable(IoSession, IoBuffer)} and
+ * {@link #decode(IoSession, IoBuffer, ProtocolDecoderOutput)}. Please
* refer to each method's documentation for detailed explanation.
*/
static MessageDecoderResult NEED_DATA = MessageDecoderResult.NEED_DATA;
/**
- * Represents a result from {@link #decodable(IoSession, ByteBuffer)} and
- * {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}. Please
+ * Represents a result from {@link #decodable(IoSession, IoBuffer)} and
+ * {@link #decode(IoSession, IoBuffer, ProtocolDecoderOutput)}. Please
* refer to each method's documentation for detailed explanation.
*/
static MessageDecoderResult NOT_OK = MessageDecoderResult.NOT_OK;
@@ -63,11 +63,11 @@
* specified buffer is decodable ({@link #OK}) or not decodable
* {@link #NOT_OK}.
*/
- MessageDecoderResult decodable(IoSession session, ByteBuffer in);
+ MessageDecoderResult decodable(IoSession session, IoBuffer in);
/**
* Decodes binary or protocol-specific content into higher-level message objects.
- * MINA invokes {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}
+ * MINA invokes {@link #decode(IoSession, IoBuffer, ProtocolDecoderOutput)}
* method with read data, and then the decoder implementation puts decoded
* messages into {@link ProtocolDecoderOutput}.
*
@@ -77,7 +77,7 @@
*
* @throws Exception if the read data violated protocol specification
*/
- MessageDecoderResult decode(IoSession session, ByteBuffer in,
+ MessageDecoderResult decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception;
/**
@@ -85,7 +85,7 @@
* parsing the data. This method is useful when you deal with the protocol which doesn't
* specify the length of a message such as HTTP response without <tt>content-length</tt>
* header. Implement this method to process the remaining data that
- * {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)} method didn't process
+ * {@link #decode(IoSession, IoBuffer, ProtocolDecoderOutput)} method didn't process
* completely.
*
* @throws Exception if the read data violated protocol specification
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -33,23 +33,23 @@
*/
public class MessageDecoderResult {
/**
- * Represents a result from {@link MessageDecoder#decodable(IoSession, ByteBuffer)}
- * and {@link MessageDecoder#decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}.
+ * Represents a result from {@link MessageDecoder#decodable(IoSession, IoBuffer)}
+ * and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
public static MessageDecoderResult OK = new MessageDecoderResult("OK");
/**
- * Represents a result from {@link MessageDecoder#decodable(IoSession, ByteBuffer)}
- * and {@link MessageDecoder#decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}.
+ * Represents a result from {@link MessageDecoder#decodable(IoSession, IoBuffer)}
+ * and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
public static MessageDecoderResult NEED_DATA = new MessageDecoderResult(
"NEED_DATA");
/**
- * Represents a result from {@link MessageDecoder#decodable(IoSession, ByteBuffer)}
- * and {@link MessageDecoder#decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}.
+ * Represents a result from {@link MessageDecoder#decodable(IoSession, IoBuffer)}
+ * and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
public static MessageDecoderResult NOT_OK = new MessageDecoderResult(
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
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.ProtocolEncoderOutput;
@@ -44,7 +44,7 @@
* Encodes higher-level message objects into binary or protocol-specific data.
* MINA invokes {@link #encode(IoSession, Object, ProtocolEncoderOutput)}
* method with message which is popped from the session write queue, and then
- * the encoder implementation puts encoded {@link ByteBuffer}s into
+ * the encoder implementation puts encoded {@link IoBuffer}s into
* {@link ProtocolEncoderOutput}.
*
* @throws Exception if the message violated protocol specification
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.io.Serializable;
import org.apache.mina.common.BufferDataException;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoder;
@@ -30,7 +30,7 @@
/**
* A {@link ProtocolDecoder} which deserializes {@link Serializable} Java
- * objects using {@link ByteBuffer#getObject(ClassLoader)}.
+ * objects using {@link IoBuffer#getObject(ClassLoader)}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -84,7 +84,7 @@
}
@Override
- protected boolean doDecode(IoSession session, ByteBuffer in,
+ protected boolean doDecode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
if (!in.prefixedDataAvailable(4, maxObjectSize)) {
return false;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.io.NotSerializableException;
import java.io.Serializable;
-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.ProtocolEncoderAdapter;
@@ -30,7 +30,7 @@
/**
* A {@link ProtocolEncoder} which serializes {@link Serializable} Java objects
- * using {@link ByteBuffer#putObject(Object)}.
+ * using {@link IoBuffer#putObject(Object)}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -75,7 +75,7 @@
throw new NotSerializableException();
}
- ByteBuffer buf = ByteBuffer.allocate(64);
+ IoBuffer buf = IoBuffer.allocate(64);
buf.setAutoExpand(true);
buf.putObject(message);
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import java.io.StreamCorruptedException;
import org.apache.mina.common.BufferDataException;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
/**
* An {@link ObjectInput} and {@link InputStream} that can read the objects encoded
@@ -108,7 +108,7 @@
+ objectSize + " (expected: <= " + maxObjectSize + ')');
}
- ByteBuffer buf = ByteBuffer.allocate(objectSize + 4, false);
+ IoBuffer buf = IoBuffer.allocate(objectSize + 4, false);
buf.putInt(objectSize);
in.readFully(buf.array(), 4, objectSize);
buf.position(0);
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.io.ObjectOutput;
import java.io.OutputStream;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
/**
* An {@link ObjectOutput} and {@link OutputStream} that can write the objects as
@@ -103,7 +103,7 @@
}
public void writeObject(Object obj) throws IOException {
- ByteBuffer buf = ByteBuffer.allocate(64, false);
+ IoBuffer buf = IoBuffer.allocate(64, false);
buf.setAutoExpand(true);
buf.putObject(obj);
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.nio.charset.CharsetDecoder;
import org.apache.mina.common.BufferDataException;
-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.ProtocolDecoder;
@@ -43,7 +43,7 @@
private final LineDelimiter delimiter;
- private ByteBuffer delimBuf;
+ private IoBuffer delimBuf;
private int maxLineLength = 1024;
@@ -104,7 +104,7 @@
this.maxLineLength = maxLineLength;
}
- public void decode(IoSession session, ByteBuffer in,
+ public void decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
Context ctx = getContext(session);
@@ -138,7 +138,7 @@
}
}
- private int decodeAuto(ByteBuffer in, ByteBuffer buf, int matchCount,
+ private int decodeAuto(IoBuffer in, IoBuffer buf, int matchCount,
CharsetDecoder decoder, ProtocolDecoderOutput out)
throws CharacterCodingException {
// Try to find a match
@@ -192,12 +192,12 @@
return matchCount;
}
- private int decodeNormal(ByteBuffer in, ByteBuffer buf, int matchCount,
+ private int decodeNormal(IoBuffer in, IoBuffer buf, int matchCount,
CharsetDecoder decoder, ProtocolDecoderOutput out)
throws CharacterCodingException {
// Convert delimiter to ByteBuffer if not done yet.
if (delimBuf == null) {
- ByteBuffer tmp = ByteBuffer.allocate(2).setAutoExpand(true);
+ IoBuffer tmp = IoBuffer.allocate(2).setAutoExpand(true);
tmp.putString(delimiter.getValue(), charset.newEncoder());
tmp.flip();
delimBuf = tmp;
@@ -246,20 +246,20 @@
private class Context {
private final CharsetDecoder decoder;
- private final ByteBuffer buf;
+ private final IoBuffer buf;
private int matchCount = 0;
private Context() {
decoder = charset.newDecoder();
- buf = ByteBuffer.allocate(80).setAutoExpand(true);
+ buf = IoBuffer.allocate(80).setAutoExpand(true);
}
public CharsetDecoder getDecoder() {
return decoder;
}
- public ByteBuffer getBuffer() {
+ public IoBuffer getBuffer() {
return buf;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-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.ProtocolEncoder;
@@ -107,7 +107,7 @@
}
String value = message.toString();
- ByteBuffer buf = ByteBuffer.allocate(value.length())
+ IoBuffer buf = IoBuffer.allocate(value.length())
.setAutoExpand(true);
buf.putString(value, encoder);
if (buf.position() > maxLineLength) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslByteBufferUtil.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslByteBufferUtil.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslByteBufferUtil.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslByteBufferUtil.java Tue Oct 2 06:39:48 2007
@@ -109,7 +109,7 @@
}
private static ByteBuffer createBuffer(int capacity) {
- if (org.apache.mina.common.ByteBuffer.isPreferDirectBuffers()) {
+ if (org.apache.mina.common.IoBuffer.isPreferDirectBuffers()) {
try {
return ByteBuffer.allocateDirect(capacity);
} catch (OutOfMemoryError e) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IoFilterAdapter;
@@ -407,7 +407,7 @@
if (!isSslStarted(session) && handler.isInboundDone()) {
handler.scheduleMessageReceived(nextFilter, message);
} else {
- ByteBuffer buf = (ByteBuffer) message;
+ IoBuffer buf = (IoBuffer) message;
if (IoSessionLogger.isDebugEnabled(session)) {
IoSessionLogger.debug(session, " Data Read: " + handler + " ("
+ buf + ')');
@@ -482,7 +482,7 @@
writeRequest);
} else {
// Otherwise, encrypt the buffer.
- ByteBuffer buf = (ByteBuffer) writeRequest.getMessage();
+ IoBuffer buf = (IoBuffer) writeRequest.getMessage();
if (IoSessionLogger.isDebugEnabled(session)) {
IoSessionLogger.debug(session, " Filtered Write: " + handler);
@@ -505,7 +505,7 @@
int pos = buf.position();
handler.encrypt(buf.buf());
buf.position(pos);
- ByteBuffer encryptedBuffer = SslHandler.copy(handler
+ IoBuffer encryptedBuffer = SslHandler.copy(handler
.getOutNetBuffer());
if (IoSessionLogger.isDebugEnabled(session)) {
@@ -632,7 +632,7 @@
}
// forward read app data
- ByteBuffer readBuffer = SslHandler.copy(handler.getAppBuffer());
+ IoBuffer readBuffer = SslHandler.copy(handler.getAppBuffer());
handler.getAppBuffer().clear();
if (IoSessionLogger.isDebugEnabled(session)) {
IoSessionLogger.debug(session, " app data read: " + readBuffer + " ("
@@ -678,10 +678,10 @@
}
private static class EncryptedWriteRequest extends WriteRequestWrapper {
- private final ByteBuffer encryptedMessage;
+ private final IoBuffer encryptedMessage;
private EncryptedWriteRequest(WriteRequest writeRequest,
- ByteBuffer encryptedMessage) {
+ IoBuffer encryptedMessage) {
super(writeRequest);
this.encryptedMessage = encryptedMessage;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java Tue Oct 2 06:39:48 2007
@@ -546,7 +546,7 @@
IoSessionLogger.debug(session, " write outNetBuffer: "
+ getOutNetBuffer());
}
- org.apache.mina.common.ByteBuffer writeBuffer = copy(getOutNetBuffer());
+ org.apache.mina.common.IoBuffer writeBuffer = copy(getOutNetBuffer());
if (IoSessionLogger.isDebugEnabled(session)) {
IoSessionLogger.debug(session, " session write: " + writeBuffer);
}
@@ -571,7 +571,7 @@
IoSessionLogger.debug(session, " write outNetBuffer2: "
+ getOutNetBuffer());
}
- org.apache.mina.common.ByteBuffer writeBuffer2 = copy(getOutNetBuffer());
+ org.apache.mina.common.IoBuffer writeBuffer2 = copy(getOutNetBuffer());
writeFuture = new DefaultWriteFuture(session);
parent.filterWrite(nextFilter, session,
new DefaultWriteRequest(writeBuffer2, writeFuture));
@@ -702,8 +702,8 @@
* @param src the buffer to copy
* @return the new buffer, ready to read from
*/
- public static org.apache.mina.common.ByteBuffer copy(java.nio.ByteBuffer src) {
- org.apache.mina.common.ByteBuffer copy = org.apache.mina.common.ByteBuffer
+ public static org.apache.mina.common.IoBuffer copy(java.nio.ByteBuffer src) {
+ org.apache.mina.common.IoBuffer copy = org.apache.mina.common.IoBuffer
.allocate(src.remaining());
copy.put(src);
copy.flip();
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IoFilterAdapter;
@@ -36,7 +36,7 @@
* Filter implementation which makes it possible to write {@link InputStream}
* objects directly using {@link IoSession#write(Object)}. When an
* {@link InputStream} is written to a session this filter will read the bytes
- * from the stream into {@link ByteBuffer} objects and write those buffers
+ * from the stream into {@link IoBuffer} objects and write those buffers
* to the next filter. When end of stream has been reached this filter will
* call {@link NextFilter#messageSent(IoSession,WriteRequest)} using the original
* {@link InputStream} written to the session and notifies
@@ -102,7 +102,7 @@
InputStream inputStream = (InputStream) message;
- ByteBuffer byteBuffer = getNextByteBuffer(inputStream);
+ IoBuffer byteBuffer = getNextByteBuffer(inputStream);
if (byteBuffer == null) {
// End of stream reached.
writeRequest.getFuture().setWritten(true);
@@ -138,7 +138,7 @@
if (inputStream == null) {
nextFilter.messageSent(session, writeRequest);
} else {
- ByteBuffer byteBuffer = getNextByteBuffer(inputStream);
+ IoBuffer byteBuffer = getNextByteBuffer(inputStream);
if (byteBuffer == null) {
// End of stream reached.
@@ -165,7 +165,7 @@
}
}
- private ByteBuffer getNextByteBuffer(InputStream is) throws IOException {
+ private IoBuffer getNextByteBuffer(InputStream is) throws IOException {
byte[] bytes = new byte[writeBufferSize];
int off = 0;
@@ -179,7 +179,7 @@
return null;
}
- ByteBuffer buffer = ByteBuffer.wrap(bytes, 0, off);
+ IoBuffer buffer = IoBuffer.wrap(bytes, 0, off);
return buffer;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
@@ -169,8 +169,8 @@
@Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- if (message instanceof ByteBuffer) {
- add(session, ((ByteBuffer) message).remaining());
+ if (message instanceof IoBuffer) {
+ add(session, ((IoBuffer) message).remaining());
}
nextFilter.messageReceived(session, message);
@@ -181,8 +181,8 @@
@Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- if (message instanceof ByteBuffer) {
- release(session, ((ByteBuffer) message).remaining());
+ if (message instanceof IoBuffer) {
+ release(session, ((IoBuffer) message).remaining());
}
nextFilter.messageReceived(session, message);
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionInputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionInputStream.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionInputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionInputStream.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
@@ -36,7 +36,7 @@
class IoSessionInputStream extends InputStream {
private final Object mutex = new Object();
- private final ByteBuffer buf;
+ private final IoBuffer buf;
private volatile boolean closed;
@@ -45,7 +45,7 @@
private IOException exception;
public IoSessionInputStream() {
- buf = ByteBuffer.allocate(16);
+ buf = IoBuffer.allocate(16);
buf.setAutoExpand(true);
buf.limit(0);
}
@@ -147,7 +147,7 @@
released = true;
}
- public void write(ByteBuffer src) {
+ public void write(IoBuffer src) {
synchronized (mutex) {
if (closed) {
return;
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/IoSessionOutputStream.java Tue Oct 2 06:39:48 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
@@ -58,7 +58,7 @@
}
}
- private synchronized void write(ByteBuffer buf) throws IOException {
+ private synchronized void write(IoBuffer buf) throws IOException {
checkClosed();
WriteFuture future = session.write(buf);
lastWriteFuture = future;
@@ -66,12 +66,12 @@
@Override
public void write(byte[] b, int off, int len) throws IOException {
- write(ByteBuffer.wrap(b.clone(), off, len));
+ write(IoBuffer.wrap(b.clone(), off, len));
}
@Override
public void write(int b) throws IOException {
- ByteBuffer buf = ByteBuffer.allocate(1);
+ IoBuffer buf = IoBuffer.allocate(1);
buf.put((byte) b);
buf.flip();
write(buf);
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.io.OutputStream;
import java.net.SocketTimeoutException;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandler;
@@ -132,7 +132,7 @@
public void messageReceived(IoSession session, Object buf) {
final IoSessionInputStream in = (IoSessionInputStream) session
.getAttribute(KEY_IN);
- in.write((ByteBuffer) buf);
+ in.write((IoBuffer) buf);
}
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java Tue Oct 2 06:39:48 2007
@@ -32,7 +32,7 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.AbstractIoAcceptor;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.ExpiringSessionRecycler;
import org.apache.mina.common.IdleStatusChecker;
@@ -336,7 +336,7 @@
}
private void readSession(DatagramChannel channel) throws Exception {
- ByteBuffer readBuf = ByteBuffer.allocate(getSessionConfig()
+ IoBuffer readBuf = IoBuffer.allocate(getSessionConfig()
.getReceiveBufferSize());
SocketAddress remoteAddress = channel.receive(readBuf.buf());
@@ -345,7 +345,7 @@
readBuf.flip();
- ByteBuffer newBuf = ByteBuffer.allocate(readBuf.limit());
+ IoBuffer newBuf = IoBuffer.allocate(readBuf.limit());
newBuf.put(readBuf);
newBuf.flip();
@@ -396,7 +396,7 @@
break;
}
- ByteBuffer buf = (ByteBuffer) req.getMessage();
+ IoBuffer buf = (IoBuffer) req.getMessage();
if (buf.remaining() == 0) {
// pop and fire event
writeRequestQueue.poll();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java Tue Oct 2 06:39:48 2007
@@ -26,7 +26,7 @@
import java.nio.channels.SelectionKey;
import java.util.Queue;
-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;
@@ -54,7 +54,7 @@
new DefaultTransportMetadata(
"datagram", true, false,
InetSocketAddress.class,
- DatagramSessionConfig.class, ByteBuffer.class);
+ DatagramSessionConfig.class, IoBuffer.class);
private final IoService service;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioProcessor.java Tue Oct 2 06:39:48 2007
@@ -30,7 +30,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.ExceptionMonitor;
import org.apache.mina.common.FileRegion;
import org.apache.mina.common.IoSession;
@@ -156,12 +156,12 @@
}
@Override
- protected int read(IoSession session, ByteBuffer buf) throws Exception {
+ protected int read(IoSession session, IoBuffer buf) throws Exception {
return getChannel(session).read(buf.buf());
}
@Override
- protected int write(IoSession session, ByteBuffer buf) throws Exception {
+ protected int write(IoSession session, IoBuffer buf) throws Exception {
return getChannel(session).write(buf.buf());
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
-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.FileRegion;
@@ -53,7 +53,7 @@
"socket", false, true,
InetSocketAddress.class,
SocketSessionConfig.class,
- ByteBuffer.class, FileRegion.class);
+ IoBuffer.class, FileRegion.class);
private final IoService service;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java Tue Oct 2 06:39:48 2007
@@ -25,7 +25,7 @@
import java.util.concurrent.ConcurrentLinkedQueue;
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.IdleStatus;
import org.apache.mina.common.IoEvent;
@@ -178,10 +178,10 @@
while ((req = queue.poll()) != null) {
Object message = req.getMessage();
Object messageCopy = message;
- if (message instanceof ByteBuffer) {
- ByteBuffer rb = (ByteBuffer) message;
+ if (message instanceof IoBuffer) {
+ IoBuffer rb = (IoBuffer) message;
rb.mark();
- ByteBuffer wb = ByteBuffer.allocate(rb.remaining());
+ IoBuffer wb = IoBuffer.allocate(rb.remaining());
wb.put(rb);
wb.flip();
rb.reset();
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java Tue Oct 2 06:39:48 2007
@@ -35,7 +35,7 @@
import junit.framework.TestCase;
/**
- * Tests {@link ByteBuffer}.
+ * Tests {@link IoBuffer}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -57,7 +57,7 @@
public void testAllocate() throws Exception {
for (int i = 10; i < 1048576 * 2; i = i * 11 / 10) // increase by 10%
{
- ByteBuffer buf = ByteBuffer.allocate(i);
+ IoBuffer buf = IoBuffer.allocate(i);
Assert.assertEquals(0, buf.position());
Assert.assertEquals(buf.capacity(), buf.remaining());
Assert.assertTrue(buf.capacity() >= i);
@@ -66,7 +66,7 @@
}
public void testAutoExpand() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(1);
+ IoBuffer buf = IoBuffer.allocate(1);
buf.put((byte) 0);
try {
@@ -98,7 +98,7 @@
}
public void testAutoExpandMark() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(4).setAutoExpand(true);
+ IoBuffer buf = IoBuffer.allocate(4).setAutoExpand(true);
buf.put((byte) 0);
buf.put((byte) 0);
@@ -117,7 +117,7 @@
}
public void testGetString() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
CharsetDecoder decoder;
Charset charset = Charset.forName("UTF-8");
@@ -231,7 +231,7 @@
public void testGetStringWithFailure() throws Exception {
String test = "\u30b3\u30e1\u30f3\u30c8\u7de8\u96c6";
- ByteBuffer buffer = ByteBuffer.wrap(test.getBytes("Shift_JIS"));
+ IoBuffer buffer = IoBuffer.wrap(test.getBytes("Shift_JIS"));
// Make sure the limit doesn't change when an exception arose.
int oldLimit = buffer.limit();
@@ -255,7 +255,7 @@
public void testPutString() throws Exception {
CharsetEncoder encoder;
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
encoder = Charset.forName("ISO-8859-1").newEncoder();
buf.putString("ABC", encoder);
@@ -321,7 +321,7 @@
}
public void testGetPrefixedString() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
CharsetEncoder encoder;
CharsetDecoder decoder;
encoder = Charset.forName("ISO-8859-1").newEncoder();
@@ -335,7 +335,7 @@
public void testPutPrefixedString() throws Exception {
CharsetEncoder encoder;
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
buf.fillAndReset(buf.remaining());
encoder = Charset.forName("ISO-8859-1").newEncoder();
@@ -382,7 +382,7 @@
public void testPutPrefixedStringWithPrefixLength() throws Exception {
CharsetEncoder encoder = Charset.forName("ISO-8859-1").newEncoder();
- ByteBuffer buf = ByteBuffer.allocate(16).sweep().setAutoExpand(true);
+ IoBuffer buf = IoBuffer.allocate(16).sweep().setAutoExpand(true);
buf.putPrefixedString("A", 1, encoder);
Assert.assertEquals(2, buf.position());
@@ -408,7 +408,7 @@
public void testPutPrefixedStringWithPadding() throws Exception {
CharsetEncoder encoder = Charset.forName("ISO-8859-1").newEncoder();
- ByteBuffer buf = ByteBuffer.allocate(16).sweep().setAutoExpand(true);
+ IoBuffer buf = IoBuffer.allocate(16).sweep().setAutoExpand(true);
buf.putPrefixedString("A", 1, 2, (byte) 32, encoder);
Assert.assertEquals(3, buf.position());
@@ -429,7 +429,7 @@
public void testWideUtf8Characters() throws Exception {
Runnable r = new Runnable() {
public void run() {
- ByteBuffer buffer = ByteBuffer.allocate(1);
+ IoBuffer buffer = IoBuffer.allocate(1);
buffer.setAutoExpand(true);
Charset charset = Charset.forName("UTF-8");
@@ -465,7 +465,7 @@
}
public void testObjectSerialization() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
buf.setAutoExpand(true);
List<Object> o = new ArrayList<Object>();
o.add(new Date());
@@ -483,7 +483,7 @@
}
public void testSweepWithZeros() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(4);
+ IoBuffer buf = IoBuffer.allocate(4);
buf.putInt(0xdeadbeef);
buf.clear();
Assert.assertEquals(0xdeadbeef, buf.getInt());
@@ -497,7 +497,7 @@
}
public void testSweepNonZeros() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(4);
+ IoBuffer buf = IoBuffer.allocate(4);
buf.putInt(0xdeadbeef);
buf.clear();
Assert.assertEquals(0xdeadbeef, buf.getInt());
@@ -515,7 +515,7 @@
nioBuf.position(3);
nioBuf.limit(7);
- ByteBuffer buf = ByteBuffer.wrap(nioBuf);
+ IoBuffer buf = IoBuffer.wrap(nioBuf);
Assert.assertEquals(3, buf.position());
Assert.assertEquals(7, buf.limit());
Assert.assertEquals(10, buf.capacity());
@@ -524,7 +524,7 @@
public void testWrapSubArray() throws Exception {
byte[] array = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
- ByteBuffer buf = ByteBuffer.wrap(array, 3, 4);
+ IoBuffer buf = IoBuffer.wrap(array, 3, 4);
Assert.assertEquals(3, buf.position());
Assert.assertEquals(7, buf.limit());
Assert.assertEquals(10, buf.capacity());
@@ -536,11 +536,11 @@
}
public void testDuplicate() throws Exception {
- ByteBuffer original;
- ByteBuffer duplicate;
+ IoBuffer original;
+ IoBuffer duplicate;
// Test if the buffer is duplicated correctly.
- original = ByteBuffer.allocate(16).sweep();
+ original = IoBuffer.allocate(16).sweep();
original.position(4);
original.limit(10);
duplicate = original.duplicate();
@@ -553,13 +553,13 @@
Assert.assertEquals(127, duplicate.get(4));
// Test a duplicate of a duplicate.
- original = ByteBuffer.allocate(16);
+ original = IoBuffer.allocate(16);
duplicate = original.duplicate().duplicate();
Assert.assertNotSame(original.buf(), duplicate.buf());
Assert.assertSame(original.buf().array(), duplicate.buf().array());
// Try to expand.
- original = ByteBuffer.allocate(16);
+ original = IoBuffer.allocate(16);
original.setAutoExpand(true);
duplicate = original.duplicate();
Assert.assertFalse(original.isAutoExpand());
@@ -580,11 +580,11 @@
}
public void testSlice() throws Exception {
- ByteBuffer original;
- ByteBuffer slice;
+ IoBuffer original;
+ IoBuffer slice;
// Test if the buffer is sliced correctly.
- original = ByteBuffer.allocate(16).sweep();
+ original = IoBuffer.allocate(16).sweep();
original.position(4);
original.limit(10);
slice = original.slice();
@@ -597,11 +597,11 @@
}
public void testReadOnlyBuffer() throws Exception {
- ByteBuffer original;
- ByteBuffer duplicate;
+ IoBuffer original;
+ IoBuffer duplicate;
// Test if the buffer is duplicated correctly.
- original = ByteBuffer.allocate(16).sweep();
+ original = IoBuffer.allocate(16).sweep();
original.position(4);
original.limit(10);
duplicate = original.asReadOnlyBuffer();
@@ -614,7 +614,7 @@
// Try to expand.
try {
- original = ByteBuffer.allocate(16);
+ original = IoBuffer.allocate(16);
duplicate = original.asReadOnlyBuffer();
duplicate.putString("A very very very very looooooong string",
Charset.forName("ISO-8859-1").newEncoder());
@@ -625,7 +625,7 @@
}
public void testGetUnsigned() throws Exception {
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
buf.put((byte) 0xA4);
buf.put((byte) 0xD0);
buf.put((byte) 0xB3);
@@ -645,7 +645,7 @@
public void testIndexOf() throws Exception {
boolean direct = false;
for (int i = 0; i < 2; i++, direct = !direct) {
- ByteBuffer buf = ByteBuffer.allocate(16, direct);
+ IoBuffer buf = IoBuffer.allocate(16, direct);
buf.put((byte) 0x1);
buf.put((byte) 0x2);
buf.put((byte) 0x3);
@@ -674,7 +674,7 @@
}
public void testPutEnumSet() {
- ByteBuffer buf = ByteBuffer.allocate(8);
+ IoBuffer buf = IoBuffer.allocate(8);
// Test empty set
buf.putEnumSet(EnumSet.noneOf(TestEnum.class));
@@ -761,7 +761,7 @@
}
public void testGetEnumSet() {
- ByteBuffer buf = ByteBuffer.allocate(8);
+ IoBuffer buf = IoBuffer.allocate(8);
// Test empty set
buf.put((byte) 0);
@@ -865,7 +865,7 @@
}
public void testBitVectorOverFlow() {
- ByteBuffer buf = ByteBuffer.allocate(8);
+ IoBuffer buf = IoBuffer.allocate(8);
try {
buf.putEnumSet(EnumSet.of(TestEnum.E9));
fail("Should have thrown IllegalArgumentException");
@@ -896,7 +896,7 @@
}
public void testGetPutEnum() {
- ByteBuffer buf = ByteBuffer.allocate(4);
+ IoBuffer buf = IoBuffer.allocate(4);
buf.putEnum(TestEnum.E64);
buf.flip();
@@ -914,7 +914,7 @@
}
public void testGetMediumInt() {
- ByteBuffer buf = ByteBuffer.allocate(3);
+ IoBuffer buf = IoBuffer.allocate(3);
buf.put((byte) 0x01);
buf.put((byte) 0x02);
@@ -958,7 +958,7 @@
}
public void testPutMediumInt() {
- ByteBuffer buf = ByteBuffer.allocate(3);
+ IoBuffer buf = IoBuffer.allocate(3);
checkMediumInt(buf, 0);
checkMediumInt(buf, 1);
@@ -966,7 +966,7 @@
checkMediumInt(buf, 0x7fffff);
}
- private void checkMediumInt(ByteBuffer buf, int x) {
+ private void checkMediumInt(IoBuffer buf, int x) {
buf.putMediumInt(x);
assertEquals(3, buf.position());
buf.flip();
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Tue Oct 2 06:39:48 2007
@@ -25,7 +25,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
/**
@@ -37,7 +37,7 @@
public class CumulativeProtocolDecoderTest extends TestCase {
private final ProtocolCodecSession session = new ProtocolCodecSession();
- private ByteBuffer buf;
+ private IoBuffer buf;
private IntegerDecoder decoder;
public static void main(String[] args) {
@@ -46,7 +46,7 @@
@Override
protected void setUp() throws Exception {
- buf = ByteBuffer.allocate(16);
+ buf = IoBuffer.allocate(16);
decoder = new IntegerDecoder();
}
@@ -104,7 +104,7 @@
private static class IntegerDecoder extends CumulativeProtocolDecoder {
@Override
- protected boolean doDecode(IoSession session, ByteBuffer in,
+ protected boolean doDecode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
Assert.assertTrue(in.hasRemaining());
if (in.remaining() < 4) {
@@ -123,7 +123,7 @@
private static class WrongDecoder extends CumulativeProtocolDecoder {
@Override
- protected boolean doDecode(IoSession session, ByteBuffer in,
+ protected boolean doDecode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
return true;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import junit.framework.Assert;
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.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -48,7 +48,7 @@
encoder.encode(session, expected, out);
Assert.assertEquals(1, session.getEncoderOutputQueue().size());
- ByteBuffer buf = session.getEncoderOutputQueue().poll();
+ IoBuffer buf = session.getEncoderOutputQueue().poll();
testDecoderAndInputStream(expected, buf);
}
@@ -63,10 +63,10 @@
osos.writeObject(expected);
osos.flush();
- testDecoderAndInputStream(expected, ByteBuffer.wrap(baos.toByteArray()));
+ testDecoderAndInputStream(expected, IoBuffer.wrap(baos.toByteArray()));
}
- private void testDecoderAndInputStream(String expected, ByteBuffer in)
+ private void testDecoderAndInputStream(String expected, IoBuffer in)
throws Exception {
// Test InputStream
ObjectSerializationInputStream osis = new ObjectSerializationInputStream(
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java Tue Oct 2 06:39:48 2007
@@ -25,7 +25,7 @@
import junit.framework.Assert;
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.ProtocolDecoderOutput;
@@ -47,7 +47,7 @@
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
ProtocolCodecSession session = new ProtocolCodecSession();
ProtocolDecoderOutput out = session.getDecoderOutput();
- ByteBuffer in = ByteBuffer.allocate(16);
+ IoBuffer in = IoBuffer.allocate(16);
// Test one decode and one output
in.putString("ABC\r\n", encoder);
@@ -148,7 +148,7 @@
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
ProtocolCodecSession session = new ProtocolCodecSession();
ProtocolDecoderOutput out = session.getDecoderOutput();
- ByteBuffer in = ByteBuffer.allocate(16);
+ IoBuffer in = IoBuffer.allocate(16);
// Test one decode and one output
in.putString("ABC\r\n", encoder);
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import junit.framework.Assert;
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.ProtocolEncoderOutput;
@@ -47,7 +47,7 @@
encoder.encode(session, "ABC", out);
Assert.assertEquals(1, session.getEncoderOutputQueue().size());
- ByteBuffer buf = session.getEncoderOutputQueue().poll();
+ IoBuffer buf = session.getEncoderOutputQueue().poll();
Assert.assertEquals(5, buf.remaining());
Assert.assertEquals('A', buf.get());
Assert.assertEquals('B', buf.get());
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Tue Oct 2 06:39:48 2007
@@ -13,7 +13,7 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IdleStatus;
@@ -190,7 +190,7 @@
private SocketAddress connectAndWrite(NioSocketConnector connector, int clientNr) {
ConnectFuture connectFuture = connector.connect(new InetSocketAddress("localhost",PORT));
connectFuture.awaitUninterruptibly(TIMEOUT);
- ByteBuffer message = ByteBuffer.allocate(4).putInt(clientNr).flip();
+ IoBuffer message = IoBuffer.allocate(4).putInt(clientNr).flip();
IoSession session = connectFuture.getSession();
session.write(message).awaitUninterruptibly(TIMEOUT);
return session.getLocalAddress();
@@ -279,7 +279,7 @@
return new ProtocolEncoderAdapter() {
public void encode(IoSession session, Object message, ProtocolEncoderOutput out) throws Exception {
logger.info("encode");
- ByteBuffer buffer = ByteBuffer.allocate(4).putInt(123).flip();
+ IoBuffer buffer = IoBuffer.allocate(4).putInt(123).flip();
out.write(buffer);
}
};
@@ -287,7 +287,7 @@
public ProtocolDecoder getDecoder() throws Exception {
return new ProtocolDecoderAdapter() {
- public void decode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) throws Exception {
+ public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception {
if (in.remaining() >= 4) {
int value = in.getInt();
logger.info("decode");
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java Tue Oct 2 06:39:48 2007
@@ -33,7 +33,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.DummySession;
import org.apache.mina.common.IdleStatus;
@@ -162,7 +162,7 @@
/*
* Record expectations
*/
- nextFilter.filterWrite(session, new DefaultWriteRequest(ByteBuffer
+ nextFilter.filterWrite(session, new DefaultWriteRequest(IoBuffer
.wrap(data)));
mockNextFilter.setMatcher(new WriteRequestMatcher());
nextFilter.messageSent(session, writeRequest);
@@ -201,11 +201,11 @@
WriteRequest writeRequest = new DefaultWriteRequest(stream,
new DummyWriteFuture());
- WriteRequest chunk1Request = new DefaultWriteRequest(ByteBuffer
+ WriteRequest chunk1Request = new DefaultWriteRequest(IoBuffer
.wrap(chunk1));
- WriteRequest chunk2Request = new DefaultWriteRequest(ByteBuffer
+ WriteRequest chunk2Request = new DefaultWriteRequest(IoBuffer
.wrap(chunk2));
- WriteRequest chunk3Request = new DefaultWriteRequest(ByteBuffer
+ WriteRequest chunk3Request = new DefaultWriteRequest(IoBuffer
.wrap(chunk3));
/*
@@ -501,7 +501,7 @@
@Override
public void messageReceived(IoSession session, Object message)
throws Exception {
- ByteBuffer buf = (ByteBuffer) message;
+ IoBuffer buf = (IoBuffer) message;
while (buf.hasRemaining()) {
digest.update(buf.get());
bytesRead++;
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.IoAcceptor;
@@ -164,7 +164,7 @@
future.awaitUninterruptibly();
sessions[i] = future.getSession();
Assert.assertTrue(sessions[i].isConnected());
- Assert.assertTrue(sessions[i].write(ByteBuffer.allocate(1)).awaitUninterruptibly().isWritten());
+ Assert.assertTrue(sessions[i].write(IoBuffer.allocate(1)).awaitUninterruptibly().isWritten());
}
// Wait for the server side sessions to be created.
@@ -231,13 +231,13 @@
@Override
public void messageReceived(IoSession session, Object message)
throws Exception {
- if (!(message instanceof ByteBuffer)) {
+ if (!(message instanceof IoBuffer)) {
return;
}
- ByteBuffer rb = (ByteBuffer) message;
+ IoBuffer rb = (IoBuffer) message;
// Write the received data back to remote peer
- ByteBuffer wb = ByteBuffer.allocate(rb.remaining());
+ IoBuffer wb = IoBuffer.allocate(rb.remaining());
wb.put(rb);
wb.flip();
session.write(wb);
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.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.common.ConnectFuture;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoHandler;
@@ -165,7 +165,7 @@
}
private void write(IoSession session, String s) throws Exception {
- session.write(ByteBuffer.wrap(s.getBytes("ASCII")));
+ session.write(IoBuffer.wrap(s.getBytes("ASCII")));
}
private int read(IoSession session) throws Exception {
@@ -209,7 +209,7 @@
@Override
public void messageReceived(IoSession session, Object message)
throws Exception {
- ByteBuffer buffer = (ByteBuffer) message;
+ IoBuffer buffer = (IoBuffer) message;
byte[] data = new byte[buffer.remaining()];
buffer.get(data);
Object lock = session.getAttribute("lock");
@@ -224,7 +224,7 @@
@Override
public void messageSent(IoSession session, Object message)
throws Exception {
- ByteBuffer buffer = (ByteBuffer) message;
+ IoBuffer buffer = (IoBuffer) message;
buffer.rewind();
byte[] data = new byte[buffer.remaining()];
buffer.get(data);
@@ -239,8 +239,8 @@
public void messageReceived(IoSession session, Object message)
throws Exception {
// Just echo the received bytes.
- ByteBuffer rb = (ByteBuffer) message;
- ByteBuffer wb = ByteBuffer.allocate(rb.remaining());
+ IoBuffer rb = (IoBuffer) message;
+ IoBuffer wb = IoBuffer.allocate(rb.remaining());
wb.put(rb);
wb.flip();
session.write(wb);
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
@@ -73,7 +73,7 @@
future.awaitUninterruptibly();
WriteFuture writeFuture = future.getSession().write(
- ByteBuffer.allocate(16).putInt(0).flip());
+ IoBuffer.allocate(16).putInt(0).flip());
writeFuture.awaitUninterruptibly();
Assert.assertTrue(writeFuture.isWritten());
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java Tue Oct 2 06:39:48 2007
@@ -24,7 +24,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.ExpiringSessionRecycler;
import org.apache.mina.common.IdleStatus;
@@ -65,7 +65,7 @@
future.awaitUninterruptibly();
// Write whatever to trigger the acceptor.
- future.getSession().write(ByteBuffer.allocate(1))
+ future.getSession().write(IoBuffer.allocate(1))
.awaitUninterruptibly();
// Close the client-side connection.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.echoserver;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
@@ -68,13 +68,13 @@
@Override
public void messageReceived(IoSession session, Object message)
throws Exception {
- if (!(message instanceof ByteBuffer)) {
+ if (!(message instanceof IoBuffer)) {
return;
}
- ByteBuffer rb = (ByteBuffer) message;
+ IoBuffer rb = (IoBuffer) message;
// Write the received data back to remote peer
- ByteBuffer wb = ByteBuffer.allocate(rb.remaining());
+ IoBuffer wb = IoBuffer.allocate(rb.remaining());
wb.put(rb);
wb.flip();
session.write(wb);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java Tue Oct 2 06:39:48 2007
@@ -29,7 +29,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.demux.MessageDecoder;
@@ -54,7 +54,7 @@
public HttpRequestDecoder() {
}
- public MessageDecoderResult decodable(IoSession session, ByteBuffer in) {
+ public MessageDecoderResult decodable(IoSession session, IoBuffer in) {
// Return NEED_DATA if the whole header is not read yet.
try {
return messageComplete(in) ? MessageDecoderResult.OK
@@ -66,7 +66,7 @@
return MessageDecoderResult.NOT_OK;
}
- public MessageDecoderResult decode(IoSession session, ByteBuffer in,
+ public MessageDecoderResult decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
// Try to decode body
HttpRequestMessage m = decodeBody(in);
@@ -81,7 +81,7 @@
return MessageDecoderResult.OK;
}
- private boolean messageComplete(ByteBuffer in) throws Exception {
+ private boolean messageComplete(IoBuffer in) throws Exception {
int last = in.remaining() - 1;
if (in.remaining() < 4) {
return false;
@@ -140,7 +140,7 @@
return false;
}
- private HttpRequestMessage decodeBody(ByteBuffer in) {
+ private HttpRequestMessage decodeBody(IoBuffer in) {
request = new HttpRequestMessage();
try {
request.setHeaders(parseRequest(new StringReader(in
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java Tue Oct 2 06:39:48 2007
@@ -27,7 +27,7 @@
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.demux.MessageEncoder;
@@ -55,7 +55,7 @@
public void encode(IoSession session, Object message,
ProtocolEncoderOutput out) throws Exception {
HttpResponseMessage msg = (HttpResponseMessage) message;
- ByteBuffer buf = ByteBuffer.allocate(256);
+ IoBuffer buf = IoBuffer.allocate(256);
// Enable auto-expand for easier encoding
buf.setAutoExpand(true);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java Tue Oct 2 06:39:48 2007
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
/**
* A HTTP response message.
@@ -92,8 +92,8 @@
}
}
- public ByteBuffer getBody() {
- return ByteBuffer.wrap(body.toByteArray());
+ public IoBuffer getBody() {
+ return IoBuffer.wrap(body.toByteArray());
}
public int getBodyLength() {
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.netcat;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
@@ -57,7 +57,7 @@
@Override
public void messageReceived(IoSession session, Object message) {
- ByteBuffer buf = (ByteBuffer) message;
+ IoBuffer buf = (IoBuffer) message;
// Print out read buffer content.
while (buf.hasRemaining()) {
System.out.print((char) buf.get());
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Tue Oct 2 06:39:48 2007
@@ -21,7 +21,7 @@
import java.nio.charset.Charset;
-import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionLogger;
@@ -55,8 +55,8 @@
@Override
public void messageReceived(IoSession session, Object message)
throws Exception {
- ByteBuffer rb = (ByteBuffer) message;
- ByteBuffer wb = ByteBuffer.allocate(rb.remaining());
+ IoBuffer rb = (IoBuffer) message;
+ IoBuffer wb = IoBuffer.allocate(rb.remaining());
rb.mark();
wb.put(rb);
wb.flip();
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.sumup.codec;
-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.filter.codec.ProtocolDecoderOutput;
@@ -44,7 +44,7 @@
this.type = type;
}
- public MessageDecoderResult decodable(IoSession session, ByteBuffer in) {
+ public MessageDecoderResult decodable(IoSession session, IoBuffer in) {
// Return NEED_DATA if the whole header is not read yet.
if (in.remaining() < Constants.HEADER_LEN) {
return MessageDecoderResult.NEED_DATA;
@@ -59,7 +59,7 @@
return MessageDecoderResult.NOT_OK;
}
- public MessageDecoderResult decode(IoSession session, ByteBuffer in,
+ public MessageDecoderResult decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
// Try to skip header if not read.
if (!readHeader) {
@@ -86,5 +86,5 @@
* @return <tt>null</tt> if the whole body is not read yet
*/
protected abstract AbstractMessage decodeBody(IoSession session,
- ByteBuffer in);
+ IoBuffer in);
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.sumup.codec;
-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.filter.codec.ProtocolEncoderOutput;
@@ -42,7 +42,7 @@
public void encode(IoSession session, Object message,
ProtocolEncoderOutput out) throws Exception {
AbstractMessage m = (AbstractMessage) message;
- ByteBuffer buf = ByteBuffer.allocate(16);
+ IoBuffer buf = IoBuffer.allocate(16);
buf.setAutoExpand(true); // Enable auto-expand for easier encoding
// Encode a header
@@ -56,5 +56,5 @@
}
protected abstract void encodeBody(IoSession session,
- AbstractMessage message, ByteBuffer out);
+ AbstractMessage message, IoBuffer out);
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.sumup.codec;
-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.AddMessage;
@@ -39,7 +39,7 @@
}
@Override
- protected AbstractMessage decodeBody(IoSession session, ByteBuffer in) {
+ protected AbstractMessage decodeBody(IoSession session, IoBuffer in) {
if (in.remaining() < Constants.ADD_BODY_LEN) {
return null;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.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.AddMessage;
@@ -50,7 +50,7 @@
@Override
protected void encodeBody(IoSession session, AbstractMessage message,
- ByteBuffer out) {
+ IoBuffer out) {
AddMessage m = (AddMessage) message;
out.putInt(m.getValue());
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java?rev=581234&r1=581233&r2=581234&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java Tue Oct 2 06:39:48 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.example.sumup.codec;
-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;
@@ -42,7 +42,7 @@
}
@Override
- protected AbstractMessage decodeBody(IoSession session, ByteBuffer in) {
+ protected AbstractMessage decodeBody(IoSession session, IoBuffer in) {
if (!readCode) {
if (in.remaining() < Constants.RESULT_CODE_LEN) {
return null; // Need more data.