You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/11/10 15:50:50 UTC
[3/4] qpid-jms-amqp-0-x git commit: QPID-7725: [Java Client,
AMQP 0-x] Remove QpidByteBuffer
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/AMQType.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/AMQType.java b/client/src/main/java/org/apache/qpid/framing/AMQType.java
index b42efed..24594ce 100644
--- a/client/src/main/java/org/apache/qpid/framing/AMQType.java
+++ b/client/src/main/java/org/apache/qpid/framing/AMQType.java
@@ -21,9 +21,10 @@
package org.apache.qpid.framing;
import java.math.BigDecimal;
+import java.nio.ByteBuffer;
import java.util.Collection;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
/**
* AMQType is a type that represents the different possible AMQP field table types. It provides operations for each
@@ -51,12 +52,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
EncodingUtils.writeLongStringBytes(buffer, (String) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return EncodingUtils.readLongString(buffer);
}
@@ -98,14 +99,14 @@ public enum AMQType
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putLong( (Long) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
- return buffer.getUnsignedInt();
+ return ByteBufferUtils.getUnsignedInt(buffer);
}
},
@@ -130,7 +131,7 @@ public enum AMQType
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
BigDecimal bd = (BigDecimal) value;
@@ -143,7 +144,7 @@ public enum AMQType
buffer.putInt(unscaled);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
byte places = buffer.get();
@@ -175,12 +176,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putLong ((Long) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getLong();
}
@@ -233,7 +234,7 @@ public enum AMQType
return (FieldTable) value;
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
// Ensure that the value is a FieldTable.
if (!(value instanceof FieldTable))
@@ -253,7 +254,7 @@ public enum AMQType
*
* @return An instance of the type.
*/
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
try
{
@@ -295,7 +296,7 @@ public enum AMQType
return FieldArray.asFieldArray((Collection)value);
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
if (!(value instanceof FieldArray))
@@ -316,7 +317,7 @@ public enum AMQType
*
* @return An instance of the type.
*/
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
// Read size of field table then all name/value pairs.
return FieldArray.readFromBuffer(buffer);
@@ -343,10 +344,10 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{ }
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return null;
}
@@ -372,12 +373,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
EncodingUtils.writeLongstr(buffer, (byte[]) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return EncodingUtils.readLongstr(buffer);
}
@@ -402,12 +403,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
EncodingUtils.writeLongStringBytes(buffer, (String) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return EncodingUtils.readLongString(buffer);
}
@@ -433,12 +434,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
EncodingUtils.writeLongStringBytes(buffer, (String) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return EncodingUtils.readLongString(buffer);
}
@@ -468,12 +469,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
EncodingUtils.writeBoolean(buffer, (Boolean) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.get() == 1;
}
@@ -503,13 +504,13 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
char charVal = (Character) value;
buffer.put((byte) charVal);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return (char) buffer.get();
}
@@ -539,12 +540,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.put((Byte) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.get();
}
@@ -578,12 +579,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putShort((Short) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getShort();
}
@@ -620,11 +621,11 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putInt((Integer) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getInt();
}
@@ -666,12 +667,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putLong ((Long) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getLong();
}
@@ -701,12 +702,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putFloat ((Float) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getFloat();
}
@@ -740,12 +741,12 @@ public enum AMQType
}
}
- public void writeValueImpl(Object value, QpidByteBuffer buffer)
+ public void writeValueImpl(Object value, ByteBuffer buffer)
{
buffer.putDouble((Double) value);
}
- public Object readValueFromBuffer(QpidByteBuffer buffer)
+ public Object readValueFromBuffer(ByteBuffer buffer)
{
return buffer.getDouble();
}
@@ -805,13 +806,13 @@ public enum AMQType
return AMQTypedValue.createAMQTypedValue(this, toNativeValue(value));
}
- public void writeToBuffer(Object value, QpidByteBuffer buffer)
+ public void writeToBuffer(Object value, ByteBuffer buffer)
{
buffer.put(identifier());
writeValueImpl(value, buffer);
}
- abstract void writeValueImpl(Object value, QpidByteBuffer buffer);
+ abstract void writeValueImpl(Object value, ByteBuffer buffer);
/**
* Reads an instance of the type from a specified byte buffer.
@@ -820,5 +821,5 @@ public enum AMQType
*
* @return An instance of the type.
*/
- abstract Object readValueFromBuffer(QpidByteBuffer buffer);
+ abstract Object readValueFromBuffer(ByteBuffer buffer);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/AMQTypedValue.java b/client/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
index dd4605e..d71e89b 100644
--- a/client/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
+++ b/client/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
@@ -21,12 +21,11 @@
package org.apache.qpid.framing;
import java.math.BigDecimal;
+import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-
/**
* AMQTypedValue combines together a native Java Object value, and an {@link AMQType}, as a fully typed AMQP parameter
* value. It provides the ability to read and write fully typed parameters to and from byte buffers. It also provides
@@ -40,7 +39,7 @@ public abstract class AMQTypedValue
public abstract Object getValue();
- public abstract void writeToBuffer(QpidByteBuffer buffer);
+ public abstract void writeToBuffer(ByteBuffer buffer);
public abstract int getEncodingSize();
@@ -64,7 +63,7 @@ public abstract class AMQTypedValue
_value = type.toNativeValue(value);
}
- private GenericTypedValue(AMQType type, QpidByteBuffer buffer)
+ private GenericTypedValue(AMQType type, ByteBuffer buffer)
{
_type = type;
_value = type.readValueFromBuffer(buffer);
@@ -81,7 +80,7 @@ public abstract class AMQTypedValue
return _value;
}
- public void writeToBuffer(QpidByteBuffer buffer)
+ public void writeToBuffer(ByteBuffer buffer)
{
_type.writeToBuffer(_value, buffer);
}
@@ -128,7 +127,7 @@ public abstract class AMQTypedValue
_value = value;
}
- public LongTypedValue(QpidByteBuffer buffer)
+ public LongTypedValue(ByteBuffer buffer)
{
_value = buffer.getLong();
}
@@ -144,7 +143,7 @@ public abstract class AMQTypedValue
return _value;
}
- public void writeToBuffer(QpidByteBuffer buffer)
+ public void writeToBuffer(ByteBuffer buffer)
{
buffer.put(AMQType.LONG.identifier());
buffer.putLong(_value);
@@ -183,7 +182,7 @@ public abstract class AMQTypedValue
return _value;
}
- public void writeToBuffer(QpidByteBuffer buffer)
+ public void writeToBuffer(ByteBuffer buffer)
{
buffer.put(AMQType.INT.identifier());
buffer.putInt(_value);
@@ -196,7 +195,7 @@ public abstract class AMQTypedValue
}
- public static AMQTypedValue readFromBuffer(QpidByteBuffer buffer)
+ public static AMQTypedValue readFromBuffer(ByteBuffer buffer)
{
AMQType type = AMQTypeMap.getType(buffer.get());
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/AccessRequestBody.java b/client/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
index 9d2c535..0291c1b 100644
--- a/client/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class AccessRequestBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -120,7 +121,7 @@ public class AccessRequestBody extends AMQMethodBodyImpl implements EncodableAMQ
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _realm );
writeBitfield( buffer, _bitfield0 );
@@ -155,7 +156,7 @@ public class AccessRequestBody extends AMQMethodBodyImpl implements EncodableAMQ
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
AMQShortString realm = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java b/client/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
index bffaa21..d03094d 100644
--- a/client/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class AccessRequestOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -67,7 +69,7 @@ public class AccessRequestOkBody extends AMQMethodBodyImpl implements EncodableA
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _ticket );
}
@@ -86,10 +88,10 @@ public class AccessRequestOkBody extends AMQMethodBodyImpl implements EncodableA
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
- int ticket = buffer.getUnsignedShort();
+ int ticket = ByteBufferUtils.getUnsignedShort(buffer);
if(!dispatcher.ignoreAllButCloseOk())
{
dispatcher.receiveAccessRequestOk(ticket);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicAckBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicAckBody.java b/client/src/main/java/org/apache/qpid/framing/BasicAckBody.java
index 9a832a2..410c7d4 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicAckBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicAckBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicAckBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -79,7 +80,7 @@ public class BasicAckBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeLong( buffer, _deliveryTag );
writeBitfield( buffer, _bitfield0 );
@@ -102,7 +103,7 @@ public class BasicAckBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicCancelBody.java b/client/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
index 7890127..5af85e2 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicCancelBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -80,7 +81,7 @@ public class BasicCancelBody extends AMQMethodBodyImpl implements EncodableAMQDa
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _consumerTag );
writeBitfield( buffer, _bitfield0 );
@@ -103,7 +104,7 @@ public class BasicCancelBody extends AMQMethodBodyImpl implements EncodableAMQDa
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java b/client/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
index a2f0dfc..0434d5c 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicCancelOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -68,7 +69,7 @@ public class BasicCancelOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _consumerTag );
}
@@ -87,7 +88,7 @@ public class BasicCancelOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return buf.toString();
}
- public static void process(QpidByteBuffer in,
+ public static void process(ByteBuffer in,
final ClientChannelMethodProcessor dispatcher)
{
AMQShortString consumerTag = AMQShortString.readAMQShortString(in);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java b/client/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
index c9492d4..bca5473 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicConsumeBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -134,7 +136,7 @@ public class BasicConsumeBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _ticket );
writeAMQShortString( buffer, _queue );
@@ -178,12 +180,12 @@ public class BasicConsumeBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
throws AMQFrameDecodingException
{
- int ticket = buffer.getUnsignedShort();
+ int ticket = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString queue = AMQShortString.readAMQShortString(buffer);
AMQShortString consumerTag = AMQShortString.readAMQShortString(buffer);
byte bitfield = buffer.get();
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java b/client/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
index 0b5d120..a24f0e2 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicConsumeOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -68,7 +69,7 @@ public class BasicConsumeOkBody extends AMQMethodBodyImpl implements EncodableAM
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _consumerTag );
}
@@ -87,7 +88,7 @@ public class BasicConsumeOkBody extends AMQMethodBodyImpl implements EncodableAM
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
AMQShortString consumerTag = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/client/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index 4ba8d59..ec4512e 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
@@ -20,11 +20,13 @@
*/
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicContentHeaderProperties
{
@@ -80,7 +82,7 @@ public class BasicContentHeaderProperties
private static final int APPLICATION_ID_MASK = 1 << 3;
private static final int CLUSTER_ID_MASK = 1 << 2;
- private QpidByteBuffer _encodedForm;
+ private ByteBuffer _encodedForm;
public BasicContentHeaderProperties(BasicContentHeaderProperties other)
@@ -224,11 +226,11 @@ public class BasicContentHeaderProperties
return _propertyFlags;
}
- public synchronized long writePropertyListPayload(QpidByteBuffer buffer)
+ public synchronized long writePropertyListPayload(ByteBuffer buffer)
{
if(useEncodedForm())
{
- buffer.putCopyOf(_encodedForm);
+ ByteBufferUtils.copyTo(_encodedForm, buffer);
return _encodedForm.remaining();
}
@@ -317,10 +319,10 @@ public class BasicContentHeaderProperties
}
}
- public int read(QpidByteBuffer input)
+ public int read(ByteBuffer input)
{
- _propertyFlags = input.getUnsignedShort();
+ _propertyFlags = ByteBufferUtils.getUnsignedShort(input);
int length = 2;
if ((_propertyFlags & (CONTENT_TYPE_MASK)) != 0)
{
@@ -459,25 +461,22 @@ public class BasicContentHeaderProperties
{
if(useEncodedForm())
{
- final QpidByteBuffer duplicate = _encodedForm.duplicate();
- sender.send(duplicate);
- duplicate.dispose();
+ sender.send(_encodedForm.duplicate());
return _encodedForm.remaining();
}
else
{
int propertyListSize = getPropertyListSize();
- QpidByteBuffer buf = QpidByteBuffer.allocate(sender.isDirectBufferPreferred(), propertyListSize);
+ ByteBuffer buf = ByteBuffer.allocate(propertyListSize);
writePropertyListPayload(buf);
buf.flip();
sender.send(buf);
- buf.dispose();
return propertyListSize;
}
}
- public synchronized void populatePropertiesFromBuffer(QpidByteBuffer buffer, int propertyFlags, int size) throws AMQFrameDecodingException
+ public synchronized void populatePropertiesFromBuffer(ByteBuffer buffer, int propertyFlags, int size) throws AMQFrameDecodingException
{
_propertyFlags = propertyFlags;
@@ -485,20 +484,14 @@ public class BasicContentHeaderProperties
{
_logger.debug("Property flags: " + _propertyFlags);
}
- if(_encodedForm != null)
- {
- _encodedForm.dispose();
- }
- _encodedForm = buffer.view(0,size);
+ _encodedForm = ByteBufferUtils.view(buffer, 0, size);
- final QpidByteBuffer byteBuffer = _encodedForm.slice();
- decode(byteBuffer);
- byteBuffer.dispose();
+ decode(_encodedForm.slice());
buffer.position(buffer.position()+size);
}
- private void decode(QpidByteBuffer buffer) throws AMQFrameDecodingException
+ private void decode(ByteBuffer buffer) throws AMQFrameDecodingException
{
if ((_propertyFlags & (CONTENT_TYPE_MASK)) != 0)
{
@@ -512,11 +505,10 @@ public class BasicContentHeaderProperties
if ((_propertyFlags & HEADERS_MASK) != 0)
{
- long length = buffer.getUnsignedInt();
+ long length = ByteBufferUtils.getUnsignedInt(buffer);
- QpidByteBuffer buf = buffer.view(0, (int)length);
+ ByteBuffer buf = ByteBufferUtils.view(buffer, 0, (int) length);
_headers = new FieldTable(buf);
- buf.dispose();
buffer.position(buffer.position()+(int)length);
}
@@ -958,7 +950,6 @@ public class BasicContentHeaderProperties
{
if(_encodedForm != null)
{
- _encodedForm.dispose();
_encodedForm = null;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java b/client/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
index f7e87dd..44c4b46 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicDeliverBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -104,7 +105,7 @@ public class BasicDeliverBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _consumerTag );
writeLong( buffer, _deliveryTag );
@@ -139,7 +140,7 @@ public class BasicDeliverBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicGetBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicGetBody.java b/client/src/main/java/org/apache/qpid/framing/BasicGetBody.java
index 61a2e13..f61dcf4 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicGetBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicGetBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicGetBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -87,7 +89,7 @@ public class BasicGetBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _ticket );
writeAMQShortString( buffer, _queue );
@@ -114,11 +116,11 @@ public class BasicGetBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
- int ticket = buffer.getUnsignedShort();
+ int ticket = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString queue = AMQShortString.readAMQShortString(buffer);
boolean noAck = (buffer.get() & 0x01) != 0;
if(!dispatcher.ignoreAllButCloseOk())
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java b/client/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
index dbc52a4..ea3a56d 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicGetEmptyBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -68,7 +69,7 @@ public class BasicGetEmptyBody extends AMQMethodBodyImpl implements EncodableAMQ
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _clusterId );
}
@@ -87,7 +88,7 @@ public class BasicGetEmptyBody extends AMQMethodBodyImpl implements EncodableAMQ
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
AMQShortString clusterId = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java b/client/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
index 4032d50..82101d0 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicGetOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -103,7 +105,7 @@ public class BasicGetOkBody extends AMQMethodBodyImpl implements EncodableAMQDat
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeLong( buffer, _deliveryTag );
writeBitfield( buffer, _bitfield0 );
@@ -138,14 +140,14 @@ public class BasicGetOkBody extends AMQMethodBodyImpl implements EncodableAMQDat
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
long deliveryTag = buffer.getLong();
boolean redelivered = (buffer.get() & 0x01) != 0;
AMQShortString exchange = AMQShortString.readAMQShortString(buffer);
AMQShortString routingKey = AMQShortString.readAMQShortString(buffer);
- long messageCount = buffer.getUnsignedInt();
+ long messageCount = ByteBufferUtils.getUnsignedInt(buffer);
if(!dispatcher.ignoreAllButCloseOk())
{
dispatcher.receiveBasicGetOk(deliveryTag, redelivered, exchange, routingKey, messageCount);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicNackBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicNackBody.java b/client/src/main/java/org/apache/qpid/framing/BasicNackBody.java
index fbb26d1..daa302a 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicNackBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicNackBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicNackBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -91,7 +92,7 @@ public class BasicNackBody extends AMQMethodBodyImpl implements EncodableAMQData
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeLong( buffer, _deliveryTag );
writeBitfield( buffer, _bitfield0 );
@@ -117,7 +118,7 @@ public class BasicNackBody extends AMQMethodBodyImpl implements EncodableAMQData
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicPublishBody.java b/client/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
index fbf08d8..164e5ef 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicPublishBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -105,7 +107,7 @@ public class BasicPublishBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _ticket );
writeAMQShortString( buffer, _exchange );
@@ -139,11 +141,11 @@ public class BasicPublishBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
- int ticket = buffer.getUnsignedShort();
+ int ticket = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString exchange = AMQShortString.readAMQShortString(buffer);
AMQShortString routingKey = AMQShortString.readAMQShortString(buffer);
byte bitfield = buffer.get();
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicQosBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicQosBody.java b/client/src/main/java/org/apache/qpid/framing/BasicQosBody.java
index c3caa8a..a33db2c 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicQosBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicQosBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicQosBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -86,7 +88,7 @@ public class BasicQosBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedInteger( buffer, _prefetchSize );
writeUnsignedShort( buffer, _prefetchCount );
@@ -113,12 +115,12 @@ public class BasicQosBody extends AMQMethodBodyImpl implements EncodableAMQDataB
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
- long prefetchSize = buffer.getUnsignedInt();
- int prefetchCount = buffer.getUnsignedShort();
+ long prefetchSize = ByteBufferUtils.getUnsignedInt(buffer);
+ int prefetchCount = ByteBufferUtils.getUnsignedShort(buffer);
boolean global = (buffer.get() & 0x01) == 0x01;
if(!dispatcher.ignoreAllButCloseOk())
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java b/client/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
index 7e3f867..3e73136 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicQosOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -60,7 +61,7 @@ public class BasicQosOkBody extends AMQMethodBodyImpl implements EncodableAMQDat
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java b/client/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
index 04190ef..f75e9e8 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicRecoverBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -72,7 +73,7 @@ public class BasicRecoverBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBitfield( buffer, _bitfield0 );
}
@@ -91,7 +92,7 @@ public class BasicRecoverBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer in,
+ public static void process(final ByteBuffer in,
final ProtocolVersion protocolVersion,
final ServerChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java b/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
index b5d78ae..4af0504 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -74,7 +75,7 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements Encodable
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBitfield( buffer, _bitfield0 );
}
@@ -93,7 +94,7 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements Encodable
return buf.toString();
}
- public static void process(final QpidByteBuffer in,
+ public static void process(final ByteBuffer in,
final ServerChannelMethodProcessor dispatcher)
{
boolean requeue = (in.get() & 0x01) == 0x01;
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java b/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
index 0dba591..a246f12 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicRecoverSyncOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -68,7 +69,7 @@ public class BasicRecoverSyncOkBody extends AMQMethodBodyImpl implements Encodab
return 0;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicRejectBody.java b/client/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
index 854916e..8fd30e6 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BasicRejectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -79,7 +80,7 @@ public class BasicRejectBody extends AMQMethodBodyImpl implements EncodableAMQDa
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeLong( buffer, _deliveryTag );
writeBitfield( buffer, _bitfield0 );
@@ -102,7 +103,7 @@ public class BasicRejectBody extends AMQMethodBodyImpl implements EncodableAMQDa
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/BasicReturnBody.java b/client/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
index a5f7511..2dd3a6b 100644
--- a/client/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class BasicReturnBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -91,7 +93,7 @@ public class BasicReturnBody extends AMQMethodBodyImpl implements EncodableAMQDa
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _replyCode );
writeAMQShortString( buffer, _replyText );
@@ -122,11 +124,11 @@ public class BasicReturnBody extends AMQMethodBodyImpl implements EncodableAMQDa
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
{
- int replyCode = buffer.getUnsignedShort();
+ int replyCode = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString replyText = AMQShortString.readAMQShortString(buffer);
AMQShortString exchange = AMQShortString.readAMQShortString(buffer);
AMQShortString routingKey = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
index e4065c8..e06aa65 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -83,7 +85,7 @@ public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _replyCode );
writeAMQShortString( buffer, _replyText );
@@ -110,12 +112,12 @@ public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ClientChannelMethodProcessor dispatcher)
throws AMQFrameDecodingException
{
- int replyCode = buffer.getUnsignedShort();
+ int replyCode = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString replyText = AMQShortString.readAMQShortString(buffer);
FieldTable details = EncodingUtils.readFieldTable(buffer);
if(!dispatcher.ignoreAllButCloseOk())
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
index 03ebd01..961d58d 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ChannelCloseBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -89,7 +91,7 @@ public class ChannelCloseBody extends AMQMethodBodyImpl implements EncodableAMQD
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _replyCode );
writeAMQShortString( buffer, _replyText );
@@ -120,14 +122,14 @@ public class ChannelCloseBody extends AMQMethodBodyImpl implements EncodableAMQD
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ChannelMethodProcessor dispatcher)
{
- int replyCode = buffer.getUnsignedShort();
+ int replyCode = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString replyText = AMQShortString.readAMQShortString(buffer);
- int classId = buffer.getUnsignedShort();
- int methodId = buffer.getUnsignedShort();
+ int classId = ByteBufferUtils.getUnsignedShort(buffer);
+ int methodId = ByteBufferUtils.getUnsignedShort(buffer);
if(!dispatcher.ignoreAllButCloseOk())
{
dispatcher.receiveChannelClose(replyCode, replyText, classId, methodId);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
index 3b1366e..42eedfb 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ChannelCloseOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -59,7 +60,7 @@ public class ChannelCloseOkBody extends AMQMethodBodyImpl implements EncodableAM
return 0;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
index 5cf1e38..30bac89 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ChannelFlowBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -64,7 +65,7 @@ public class ChannelFlowBody extends AMQMethodBodyImpl implements EncodableAMQDa
return 1;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBitfield( buffer, _active ? (byte)1 : (byte)0);
}
@@ -83,7 +84,7 @@ public class ChannelFlowBody extends AMQMethodBodyImpl implements EncodableAMQDa
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ChannelMethodProcessor dispatcher)
{
boolean active = (buffer.get() & 0x01) == 0x01;
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
index c91bc26..d783125 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ChannelFlowOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -65,7 +66,7 @@ public class ChannelFlowOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBitfield( buffer, _active ? (byte)1 : (byte)0 );
}
@@ -84,7 +85,7 @@ public class ChannelFlowOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ChannelMethodProcessor dispatcher)
{
boolean active = (buffer.get() & 0x01) == 0x01;
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java b/client/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
index 5a111b0..607ca96 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.framing;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import java.nio.ByteBuffer;
public interface ChannelMethodProcessor
{
@@ -32,7 +32,7 @@ public interface ChannelMethodProcessor
void receiveChannelCloseOk();
- void receiveMessageContent(QpidByteBuffer data);
+ void receiveMessageContent(ByteBuffer data);
void receiveMessageHeader(BasicContentHeaderProperties properties, long bodySize);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
index fbf66ed..0b8eaa0 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ChannelOpenBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -57,7 +58,7 @@ public class ChannelOpenBody extends AMQMethodBodyImpl implements EncodableAMQDa
return 1;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, null );
}
@@ -73,7 +74,7 @@ public class ChannelOpenBody extends AMQMethodBodyImpl implements EncodableAMQDa
}
public static void process(final int channelId,
- final QpidByteBuffer buffer,
+ final ByteBuffer buffer,
final ServerMethodProcessor dispatcher)
{
AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java b/client/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
index 82d2388..92588f1 100644
--- a/client/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
@@ -28,9 +28,9 @@
package org.apache.qpid.framing;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -41,7 +41,7 @@ public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQ
public static final ChannelOpenOkBody INSTANCE_0_8 = new ChannelOpenOkBody(true);
public static final ChannelOpenOkBody INSTANCE_0_9 = new ChannelOpenOkBody(false);
- public static ChannelOpenOkBody getInstance(ProtocolVersion protocolVersion, QpidByteBuffer input)
+ public static ChannelOpenOkBody getInstance(ProtocolVersion protocolVersion, ByteBuffer input)
throws IOException
{
final boolean isAMQP08 = ProtocolVersion.v0_8.equals(protocolVersion);
@@ -77,7 +77,7 @@ public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return _isAMQP08 ? 0 : 4;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
if(!_isAMQP08)
{
@@ -95,7 +95,7 @@ public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQ
return "[ChannelOpenOkBody]";
}
- public static void process(final QpidByteBuffer in,
+ public static void process(final ByteBuffer in,
final ProtocolVersion protocolVersion,
final ClientChannelMethodProcessor dispatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java b/client/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
index 59bdc08..3ec99e5 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConfirmSelectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -64,7 +65,7 @@ public class ConfirmSelectBody extends AMQMethodBodyImpl implements EncodableAMQ
return 1;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBitfield( buffer, _nowait ? (byte)1 : (byte)0 );
}
@@ -83,7 +84,7 @@ public class ConfirmSelectBody extends AMQMethodBodyImpl implements EncodableAMQ
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer,
+ public static void process(final ByteBuffer buffer,
final ServerChannelMethodProcessor dispatcher)
{
boolean nowait = (buffer.get() & 0x01) == 0x01;
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
index a6f8317..11e46f2 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConfirmSelectOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -58,7 +59,7 @@ public class ConfirmSelectOkBody extends AMQMethodBodyImpl implements EncodableA
return 0;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
index 2550b06..117de14 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ConnectionCloseBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -90,7 +92,7 @@ public class ConnectionCloseBody extends AMQMethodBodyImpl implements EncodableA
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _replyCode );
writeAMQShortString( buffer, _replyText );
@@ -121,12 +123,12 @@ public class ConnectionCloseBody extends AMQMethodBodyImpl implements EncodableA
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final MethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final MethodProcessor dispatcher)
{
- int replyCode = buffer.getUnsignedShort();
+ int replyCode = ByteBufferUtils.getUnsignedShort(buffer);
AMQShortString replyText = AMQShortString.readAMQShortString(buffer);
- int classId = buffer.getUnsignedShort();
- int methodId = buffer.getUnsignedShort();
+ int classId = ByteBufferUtils.getUnsignedShort(buffer);
+ int methodId = ByteBufferUtils.getUnsignedShort(buffer);
dispatcher.receiveConnectionClose(replyCode, replyText, classId, methodId);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
index b0e0193..d4c59f7 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionCloseOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -62,7 +63,7 @@ public class ConnectionCloseOkBody extends AMQMethodBodyImpl implements Encodabl
return 0;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
}
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
index 123201c..3062233 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionOpenBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -83,7 +84,7 @@ public class ConnectionOpenBody extends AMQMethodBodyImpl implements EncodableAM
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _virtualHost );
writeAMQShortString( buffer, _capabilities );
@@ -110,7 +111,7 @@ public class ConnectionOpenBody extends AMQMethodBodyImpl implements EncodableAM
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final ServerMethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final ServerMethodProcessor dispatcher)
{
AMQShortString virtualHost = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
index 6e909d5..e0afce2 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -69,7 +70,7 @@ public class ConnectionOpenOkBody extends AMQMethodBodyImpl implements Encodable
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _knownHosts );
}
@@ -88,7 +89,7 @@ public class ConnectionOpenOkBody extends AMQMethodBodyImpl implements Encodable
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final ClientMethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final ClientMethodProcessor dispatcher)
{
AMQShortString knownHosts = AMQShortString.readAMQShortString(buffer);
if(!dispatcher.ignoreAllButCloseOk())
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
index d110f85..65657dc 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionRedirectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -75,7 +76,7 @@ public class ConnectionRedirectBody extends AMQMethodBodyImpl implements Encodab
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeAMQShortString( buffer, _host );
writeAMQShortString( buffer, _knownHosts );
@@ -98,7 +99,7 @@ public class ConnectionRedirectBody extends AMQMethodBodyImpl implements Encodab
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final ClientMethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final ClientMethodProcessor dispatcher)
{
AMQShortString host = AMQShortString.readAMQShortString(buffer);
AMQShortString knownHosts = AMQShortString.readAMQShortString(buffer);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
index 2f47487..4c73279 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionSecureBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -69,7 +70,7 @@ public class ConnectionSecureBody extends AMQMethodBodyImpl implements Encodable
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBytes( buffer, _challenge );
}
@@ -88,7 +89,7 @@ public class ConnectionSecureBody extends AMQMethodBodyImpl implements Encodable
return buf.toString();
}
- public static void process(final QpidByteBuffer in, final ClientMethodProcessor dispatcher)
+ public static void process(final ByteBuffer in, final ClientMethodProcessor dispatcher)
throws AMQFrameDecodingException
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
index 6566b1d..48108fb 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionSecureOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -68,7 +69,7 @@ public class ConnectionSecureOkBody extends AMQMethodBodyImpl implements Encodab
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeBytes( buffer, _response );
}
@@ -87,7 +88,7 @@ public class ConnectionSecureOkBody extends AMQMethodBodyImpl implements Encodab
return buf.toString();
}
- public static void process(final QpidByteBuffer in, final ServerMethodProcessor dispatcher)
+ public static void process(final ByteBuffer in, final ServerMethodProcessor dispatcher)
{
byte[] response = EncodingUtils.readBytes(in);
if(!dispatcher.ignoreAllButCloseOk())
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
index 682d968..3b82916 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ConnectionStartBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -98,7 +100,7 @@ public class ConnectionStartBody extends AMQMethodBodyImpl implements EncodableA
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedByte( buffer, _versionMajor );
writeUnsignedByte( buffer, _versionMinor );
@@ -133,11 +135,11 @@ public class ConnectionStartBody extends AMQMethodBodyImpl implements EncodableA
return buf.toString();
}
- public static void process(final QpidByteBuffer in, final ClientMethodProcessor dispatcher)
+ public static void process(final ByteBuffer in, final ClientMethodProcessor dispatcher)
throws AMQFrameDecodingException
{
- short versionMajor = in.getUnsignedByte();
- short versionMinor = in.getUnsignedByte();
+ short versionMajor = ByteBufferUtils.getUnsignedByte(in);
+ short versionMinor = ByteBufferUtils.getUnsignedByte(in);
FieldTable serverProperties = EncodingUtils.readFieldTable(in);
byte[] mechanisms = EncodingUtils.readBytes(in);
byte[] locales = EncodingUtils.readBytes(in);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
index cd1908c..d8aa2e3 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
@@ -27,8 +27,9 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionStartOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -92,7 +93,7 @@ public class ConnectionStartOkBody extends AMQMethodBodyImpl implements Encodabl
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeFieldTable( buffer, _clientProperties );
writeAMQShortString( buffer, _mechanism );
@@ -123,7 +124,7 @@ public class ConnectionStartOkBody extends AMQMethodBodyImpl implements Encodabl
return buf.toString();
}
- public static void process(final QpidByteBuffer in, final ServerMethodProcessor dispatcher)
+ public static void process(final ByteBuffer in, final ServerMethodProcessor dispatcher)
throws AMQFrameDecodingException
{
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
index f73385d..bd31b2f 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ConnectionTuneBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -81,7 +83,7 @@ public class ConnectionTuneBody extends AMQMethodBodyImpl implements EncodableAM
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _channelMax );
writeUnsignedInteger( buffer, _frameMax );
@@ -108,12 +110,12 @@ public class ConnectionTuneBody extends AMQMethodBodyImpl implements EncodableAM
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final ClientMethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final ClientMethodProcessor dispatcher)
{
- int channelMax = buffer.getUnsignedShort();
- long frameMax = buffer.getUnsignedInt();
- int heartbeat = buffer.getUnsignedShort();
+ int channelMax = ByteBufferUtils.getUnsignedShort(buffer);
+ long frameMax = ByteBufferUtils.getUnsignedInt(buffer);
+ int heartbeat = ByteBufferUtils.getUnsignedShort(buffer);
if(!dispatcher.ignoreAllButCloseOk())
{
dispatcher.receiveConnectionTune(channelMax, frameMax, heartbeat);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java b/client/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
index 35c2340..aef177d 100644
--- a/client/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
@@ -27,8 +27,10 @@
package org.apache.qpid.framing;
+import java.nio.ByteBuffer;
+
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.util.ByteBufferUtils;
public class ConnectionTuneOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
@@ -81,7 +83,7 @@ public class ConnectionTuneOkBody extends AMQMethodBodyImpl implements Encodable
return size;
}
- public void writeMethodPayload(QpidByteBuffer buffer)
+ public void writeMethodPayload(ByteBuffer buffer)
{
writeUnsignedShort( buffer, _channelMax );
writeUnsignedInteger( buffer, _frameMax );
@@ -108,12 +110,12 @@ public class ConnectionTuneOkBody extends AMQMethodBodyImpl implements Encodable
return buf.toString();
}
- public static void process(final QpidByteBuffer buffer, final ServerMethodProcessor dispatcher)
+ public static void process(final ByteBuffer buffer, final ServerMethodProcessor dispatcher)
{
- int channelMax = buffer.getUnsignedShort();
- long frameMax = buffer.getUnsignedInt();
- int heartbeat = buffer.getUnsignedShort();
+ int channelMax = ByteBufferUtils.getUnsignedShort(buffer);
+ long frameMax = ByteBufferUtils.getUnsignedInt(buffer);
+ int heartbeat = ByteBufferUtils.getUnsignedShort(buffer);
if(!dispatcher.ignoreAllButCloseOk())
{
dispatcher.receiveConnectionTuneOk(channelMax, frameMax, heartbeat);
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/95203e5d/client/src/main/java/org/apache/qpid/framing/ContentBody.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/framing/ContentBody.java b/client/src/main/java/org/apache/qpid/framing/ContentBody.java
index dd975ab..dbe0a55 100644
--- a/client/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/client/src/main/java/org/apache/qpid/framing/ContentBody.java
@@ -23,28 +23,22 @@ package org.apache.qpid.framing;
import java.nio.ByteBuffer;
import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.util.ByteBufferUtils;
public class ContentBody implements AMQBody
{
public static final byte TYPE = 3;
- private QpidByteBuffer _payload;
+ private ByteBuffer _payload;
public ContentBody(ByteBuffer payload)
{
- _payload = QpidByteBuffer.wrap(payload.duplicate());
- }
-
- public ContentBody(QpidByteBuffer payload)
- {
_payload = payload.duplicate();
}
-
public byte getFrameType()
{
return TYPE;
@@ -66,9 +60,7 @@ public class ContentBody implements AMQBody
{
if(_payload != null)
{
- final QpidByteBuffer duplicate = _payload.duplicate();
- sender.send(duplicate);
- duplicate.dispose();
+ sender.send(_payload.duplicate());
return _payload.remaining();
}
else
@@ -77,7 +69,7 @@ public class ContentBody implements AMQBody
}
}
- public QpidByteBuffer getPayload()
+ public ByteBuffer getPayload()
{
return _payload;
}
@@ -86,23 +78,20 @@ public class ContentBody implements AMQBody
{
if (_payload != null)
{
- _payload.dispose();
_payload = null;
}
}
- public static void process(final QpidByteBuffer in,
+ public static void process(final ByteBuffer in,
final ChannelMethodProcessor methodProcessor, final long bodySize)
{
-
- QpidByteBuffer payload = in.view(0, (int) bodySize);
+ ByteBuffer payload = ByteBufferUtils.view(in, 0, (int) bodySize);
if(!methodProcessor.ignoreAllButCloseOk())
{
methodProcessor.receiveMessageContent(payload);
}
- payload.dispose();
in.position(in.position()+(int)bodySize);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org