Added AMQP 0-9-1 support

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@829944 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 350 insertions, 347 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
index ad7f36f790..cd3d721065 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
@@ -93,4 +93,166 @@ public abstract class AMQMethodBodyImpl implements AMQMethodBody
         session.methodFrameReceived(channelId, this);
     }
 
+    public int getSize()
+    {
+        return 2 + 2 + getBodySize();
+    }
+
+        public void writePayload(ByteBuffer buffer)
+    {
+        EncodingUtils.writeUnsignedShort(buffer, getClazz());
+        EncodingUtils.writeUnsignedShort(buffer, getMethod());
+        writeMethodPayload(buffer);
+    }
+
+
+    protected byte readByte(ByteBuffer buffer)
+    {
+        return buffer.get();
+    }
+
+    protected AMQShortString readAMQShortString(ByteBuffer buffer)
+    {
+        return EncodingUtils.readAMQShortString(buffer);
+    }
+
+    protected int getSizeOf(AMQShortString string)
+    {
+        return EncodingUtils.encodedShortStringLength(string);
+    }
+
+    protected void writeByte(ByteBuffer buffer, byte b)
+    {
+        buffer.put(b);
+    }
+
+    protected void writeAMQShortString(ByteBuffer buffer, AMQShortString string)
+    {
+        EncodingUtils.writeShortStringBytes(buffer, string);
+    }
+
+    protected int readInt(ByteBuffer buffer)
+    {
+        return buffer.getInt();
+    }
+
+    protected void writeInt(ByteBuffer buffer, int i)
+    {
+        buffer.putInt(i);
+    }
+
+    protected FieldTable readFieldTable(ByteBuffer buffer) throws AMQFrameDecodingException
+    {
+        return EncodingUtils.readFieldTable(buffer);
+    }
+
+    protected int getSizeOf(FieldTable table)
+    {
+        return EncodingUtils.encodedFieldTableLength(table);  //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected void writeFieldTable(ByteBuffer buffer, FieldTable table)
+    {
+        EncodingUtils.writeFieldTableBytes(buffer, table);
+    }
+
+    protected long readLong(ByteBuffer buffer)
+    {
+        return buffer.getLong();
+    }
+
+    protected void writeLong(ByteBuffer buffer, long l)
+    {
+        buffer.putLong(l);
+    }
+
+    protected int getSizeOf(byte[] response)
+    {
+        return (response == null) ? 4 : response.length + 4;
+    }
+
+    protected void writeBytes(ByteBuffer buffer, byte[] data)
+    {
+        EncodingUtils.writeBytes(buffer,data);
+    }
+
+    protected byte[] readBytes(ByteBuffer buffer)
+    {
+        return EncodingUtils.readBytes(buffer);
+    }
+
+    protected short readShort(ByteBuffer buffer)
+    {
+        return EncodingUtils.readShort(buffer);
+    }
+
+    protected void writeShort(ByteBuffer buffer, short s)
+    {
+        EncodingUtils.writeShort(buffer, s);
+    }
+
+    protected Content readContent(ByteBuffer buffer)
+    {
+        return null;  //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected int getSizeOf(Content body)
+    {
+        return 0;  //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected void writeContent(ByteBuffer buffer, Content body)
+    {
+        //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected byte readBitfield(ByteBuffer buffer)
+    {
+        return readByte(buffer);  //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected int readUnsignedShort(ByteBuffer buffer)
+    {
+        return buffer.getUnsignedShort();  //To change body of created methods use File | Settings | File Templates.
+    }
+
+    protected void writeBitfield(ByteBuffer buffer, byte bitfield0)
+    {
+        buffer.put(bitfield0);
+    }
+
+    protected void writeUnsignedShort(ByteBuffer buffer, int s)
+    {
+        EncodingUtils.writeUnsignedShort(buffer, s);
+    }
+
+    protected long readUnsignedInteger(ByteBuffer buffer)
+    {
+        return buffer.getUnsignedInt();
+    }
+    protected void writeUnsignedInteger(ByteBuffer buffer, long i)
+    {
+        EncodingUtils.writeUnsignedInteger(buffer, i);
+    }
+
+
+    protected short readUnsignedByte(ByteBuffer buffer)
+    {
+        return buffer.getUnsigned();
+    }
+
+    protected void writeUnsignedByte(ByteBuffer buffer, short unsignedByte)
+    {
+        EncodingUtils.writeUnsignedByte(buffer, unsignedByte);
+    }
+
+    protected long readTimestamp(ByteBuffer buffer)
+    {
+        return EncodingUtils.readTimestamp(buffer);
+    }
+
+    protected void writeTimestamp(ByteBuffer buffer, long t)
+    {
+        EncodingUtils.writeTimestamp(buffer, t);
+    }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index cf8a866e47..d503ed7ea3 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
@@ -54,7 +54,10 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
     
     public ProtocolInitiation(ProtocolVersion pv)
     {
-        this(AMQP_HEADER, CURRENT_PROTOCOL_CLASS, TCP_PROTOCOL_INSTANCE, pv.getMajorVersion(), pv.getMinorVersion());
+        this(AMQP_HEADER, CURRENT_PROTOCOL_CLASS,
+             pv.equals(ProtocolVersion.v0_91) ? 0 : TCP_PROTOCOL_INSTANCE,
+             pv.equals(ProtocolVersion.v0_91) ? 9 : pv.getMajorVersion(),
+             pv.equals(ProtocolVersion.v0_91) ? 1 : pv.getMinorVersion());
     }
 
     public ProtocolInitiation(ByteBuffer in)
@@ -124,7 +127,6 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
     {
         /**
          *
-         * @param session the session
          * @param in input buffer
          * @return true if we have enough data to decode the PI frame fully, false if more
          * data is required
@@ -162,13 +164,24 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
             throw new AMQProtocolClassException("Protocol class " + CURRENT_PROTOCOL_CLASS + " was expected; received " +
                                                 _protocolClass, null);
         }
-        if (_protocolInstance != TCP_PROTOCOL_INSTANCE)
+
+        ProtocolVersion pv;
+
+        // Hack for 0-9-1 which changed how the header was defined
+        if(_protocolInstance == 0 && _protocolMajor == 9 && _protocolMinor == 1)
+        {
+            pv = ProtocolVersion.v0_91;
+
+        }
+        else if (_protocolInstance != TCP_PROTOCOL_INSTANCE)
         {
             throw new AMQProtocolInstanceException("Protocol instance " + TCP_PROTOCOL_INSTANCE + " was expected; received " +
                                                    _protocolInstance, null);
         }
-
-        ProtocolVersion pv = new ProtocolVersion(_protocolMajor, _protocolMinor);
+        else
+        {
+            pv = new ProtocolVersion(_protocolMajor, _protocolMinor);
+        }
         
 
         if (!pv.isSupported())
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
index 948f5baaf6..8d51343507 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
@@ -21,14 +21,6 @@
 
 package org.apache.qpid.framing.amqp_0_9;
 
-import org.apache.qpid.framing.EncodingUtils;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.Content;
-
-import org.apache.mina.common.ByteBuffer;
-
 public abstract class AMQMethodBody_0_9 extends org.apache.qpid.framing.AMQMethodBodyImpl
 {
 
@@ -40,170 +32,6 @@ public abstract class AMQMethodBody_0_9 extends org.apache.qpid.framing.AMQMetho
     public byte getMinor()
     {
         return 9;
-    }
-
-    public int getSize()
-    {
-        return 2 + 2 + getBodySize();
-    }
-
-    public void writePayload(ByteBuffer buffer)
-    {
-        EncodingUtils.writeUnsignedShort(buffer, getClazz());
-        EncodingUtils.writeUnsignedShort(buffer, getMethod());
-        writeMethodPayload(buffer);
-    }
-
-
-    protected byte readByte(ByteBuffer buffer)
-    {
-        return buffer.get();
-    }
-
-    protected AMQShortString readAMQShortString(ByteBuffer buffer)
-    {
-        return EncodingUtils.readAMQShortString(buffer);
-    }
-
-    protected int getSizeOf(AMQShortString string)
-    {
-        return EncodingUtils.encodedShortStringLength(string);
-    }
-
-    protected void writeByte(ByteBuffer buffer, byte b)
-    {
-        buffer.put(b);
-    }
-
-    protected void writeAMQShortString(ByteBuffer buffer, AMQShortString string)
-    {
-        EncodingUtils.writeShortStringBytes(buffer, string);
-    }
-
-    protected int readInt(ByteBuffer buffer)
-    {
-        return buffer.getInt();
-    }
-
-    protected void writeInt(ByteBuffer buffer, int i)
-    {
-        buffer.putInt(i);
-    }
-
-    protected FieldTable readFieldTable(ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-        return EncodingUtils.readFieldTable(buffer);
-    }
-
-    protected int getSizeOf(FieldTable table)
-    {
-        return EncodingUtils.encodedFieldTableLength(table);  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeFieldTable(ByteBuffer buffer, FieldTable table)
-    {
-        EncodingUtils.writeFieldTableBytes(buffer, table);
-    }
-
-    protected long readLong(ByteBuffer buffer)
-    {
-        return buffer.getLong();
-    }
-
-    protected void writeLong(ByteBuffer buffer, long l)
-    {
-        buffer.putLong(l);
-    }
-
-    protected int getSizeOf(byte[] response)
-    {
-        return (response == null) ? 4 :response.length + 4;
-    }
-
-    protected void writeBytes(ByteBuffer buffer, byte[] data)
-    {
-        EncodingUtils.writeBytes(buffer,data);
-    }
-
-    protected byte[] readBytes(ByteBuffer buffer)
-    {
-        return EncodingUtils.readBytes(buffer);
-    }
-
-    protected short readShort(ByteBuffer buffer)
-    {
-        return EncodingUtils.readShort(buffer);
-    }
-
-    protected void writeShort(ByteBuffer buffer, short s)
-    {
-        EncodingUtils.writeShort(buffer, s);
-    }
-
-    protected Content readContent(ByteBuffer buffer)
-    {
-        return null;  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected int getSizeOf(Content body)
-    {
-        return 0;  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeContent(ByteBuffer buffer, Content body)
-    {
-        //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected byte readBitfield(ByteBuffer buffer)
-    {
-        return readByte(buffer);  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected int readUnsignedShort(ByteBuffer buffer)
-    {
-        return buffer.getUnsignedShort();  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeBitfield(ByteBuffer buffer, byte bitfield0)
-    {
-        buffer.put(bitfield0);
-    }
-
-    protected void writeUnsignedShort(ByteBuffer buffer, int s)
-    {
-        EncodingUtils.writeUnsignedShort(buffer, s);
-    }
-
-    protected long readUnsignedInteger(ByteBuffer buffer)
-    {
-        return buffer.getUnsignedInt();
-    }
-    protected void writeUnsignedInteger(ByteBuffer buffer, long i)
-    {
-        EncodingUtils.writeUnsignedInteger(buffer, i);
-    }
-
-
-    protected short readUnsignedByte(ByteBuffer buffer)
-    {
-        return buffer.getUnsigned();
-    }
-
-    protected void writeUnsignedByte(ByteBuffer buffer, short unsignedByte)
-    {
-        EncodingUtils.writeUnsignedByte(buffer, unsignedByte);
-    }
-
-    protected long readTimestamp(ByteBuffer buffer)
-    {
-        return EncodingUtils.readTimestamp(buffer);
-    }
-
-    protected void writeTimestamp(ByteBuffer buffer, long t)
-    {
-        EncodingUtils.writeTimestamp(buffer, t);
-    }
-        
+    }   
 
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
new file mode 100644
index 0000000000..60b8a7e1a6
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
@@ -0,0 +1,37 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.framing.amqp_0_91;
+
+public abstract class AMQMethodBody_0_91 extends org.apache.qpid.framing.AMQMethodBodyImpl
+{
+
+    public byte getMajor()
+    {
+        return 0;
+    }
+
+    public byte getMinor()
+    {
+        return 91;
+    }
+
+}
\ No newline at end of file
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
new file mode 100644
index 0000000000..6e330574bc
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
@@ -0,0 +1,132 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.framing.amqp_0_91;
+
+import org.apache.mina.common.ByteBuffer;
+
+import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
+import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
+import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
+import org.apache.qpid.framing.*;
+
+public class MethodConverter_0_91 extends AbstractMethodConverter implements ProtocolVersionMethodConverter
+{
+    private int _basicPublishClassId;
+    private int _basicPublishMethodId;
+
+    public MethodConverter_0_91()
+    {
+        super((byte)0,(byte)9);
+
+
+    }
+
+    public AMQBody convertToBody(ContentChunk contentChunk)
+    {
+        if(contentChunk instanceof ContentChunk_0_9)
+        {
+            return ((ContentChunk_0_9)contentChunk).toBody();
+        }
+        else
+        {
+            return new ContentBody(contentChunk.getData());
+        }
+    }
+
+    public ContentChunk convertToContentChunk(AMQBody body)
+    {
+        final ContentBody contentBodyChunk = (ContentBody) body;
+
+        return new ContentChunk_0_9(contentBodyChunk);
+
+    }
+
+    public void configure()
+    {
+
+        _basicPublishClassId = BasicPublishBodyImpl.CLASS_ID;
+        _basicPublishMethodId = BasicPublishBodyImpl.METHOD_ID;
+
+    }
+
+    public AMQBody convertToBody(java.nio.ByteBuffer buf)
+    {
+        return new ContentBody(ByteBuffer.wrap(buf));
+    }
+
+    public MessagePublishInfo convertToInfo(AMQMethodBody methodBody)
+    {
+        final BasicPublishBody publishBody = ((BasicPublishBody) methodBody);
+
+        final AMQShortString exchange = publishBody.getExchange();
+        final AMQShortString routingKey = publishBody.getRoutingKey();
+
+        return new MessagePublishInfoImpl(exchange,
+                                          publishBody.getImmediate(),
+                                          publishBody.getMandatory(),
+                                          routingKey);
+
+    }
+
+    public AMQMethodBody convertToBody(MessagePublishInfo info)
+    {
+
+        return new BasicPublishBodyImpl(0,
+                                    info.getExchange(),
+                                    info.getRoutingKey(),
+                                    info.isMandatory(),
+                                    info.isImmediate()) ;
+
+    }
+
+    private static class ContentChunk_0_9 implements ContentChunk
+    {
+        private final ContentBody _contentBodyChunk;
+
+        public ContentChunk_0_9(final ContentBody contentBodyChunk)
+        {
+            _contentBodyChunk = contentBodyChunk;
+        }
+
+        public int getSize()
+        {
+            return _contentBodyChunk.getSize();
+        }
+
+        public ByteBuffer getData()
+        {
+            return _contentBodyChunk.payload;
+        }
+
+        public void reduceToFit()
+        {
+            _contentBodyChunk.reduceBufferToFit();
+        }
+
+        public AMQBody toBody()
+        {
+            return _contentBodyChunk;
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
index e9b4447140..35645854c0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
@@ -21,14 +21,6 @@
 
 package org.apache.qpid.framing.amqp_8_0;
 
-import org.apache.qpid.framing.EncodingUtils;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.Content;
-
-import org.apache.mina.common.ByteBuffer;
-
 public abstract class AMQMethodBody_8_0 extends org.apache.qpid.framing.AMQMethodBodyImpl
 {
 
@@ -42,168 +34,7 @@ public abstract class AMQMethodBody_8_0 extends org.apache.qpid.framing.AMQMetho
         return 0;
     }
 
-    public int getSize()
-    {
-        return 2 + 2 + getBodySize();
-    }
-
-    public void writePayload(ByteBuffer buffer)
-    {
-        EncodingUtils.writeUnsignedShort(buffer, getClazz());
-        EncodingUtils.writeUnsignedShort(buffer, getMethod());
-        writeMethodPayload(buffer);
-    }
 
-
-    protected byte readByte(ByteBuffer buffer)
-    {
-        return buffer.get();
-    }
-
-    protected AMQShortString readAMQShortString(ByteBuffer buffer)
-    {
-        return EncodingUtils.readAMQShortString(buffer);
-    }
-
-    protected int getSizeOf(AMQShortString string)
-    {
-        return EncodingUtils.encodedShortStringLength(string);
-    }
-
-    protected void writeByte(ByteBuffer buffer, byte b)
-    {
-        buffer.put(b);
-    }
-
-    protected void writeAMQShortString(ByteBuffer buffer, AMQShortString string)
-    {
-        EncodingUtils.writeShortStringBytes(buffer, string);
-    }
-
-    protected int readInt(ByteBuffer buffer)
-    {
-        return buffer.getInt();
-    }
-
-    protected void writeInt(ByteBuffer buffer, int i)
-    {
-        buffer.putInt(i);
-    }
-
-    protected FieldTable readFieldTable(ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-        return EncodingUtils.readFieldTable(buffer);
-    }
-
-    protected int getSizeOf(FieldTable table)
-    {
-        return EncodingUtils.encodedFieldTableLength(table);  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeFieldTable(ByteBuffer buffer, FieldTable table)
-    {
-        EncodingUtils.writeFieldTableBytes(buffer, table);
-    }
-
-    protected long readLong(ByteBuffer buffer)
-    {
-        return buffer.getLong();
-    }
-
-    protected void writeLong(ByteBuffer buffer, long l)
-    {
-        buffer.putLong(l);
-    }
-
-    protected int getSizeOf(byte[] response)
-    {
-        return (response == null) ? 4 : response.length + 4;
-    }
-
-    protected void writeBytes(ByteBuffer buffer, byte[] data)
-    {
-        EncodingUtils.writeBytes(buffer,data);
-    }
-
-    protected byte[] readBytes(ByteBuffer buffer)
-    {
-        return EncodingUtils.readBytes(buffer);
-    }
-
-    protected short readShort(ByteBuffer buffer)
-    {
-        return EncodingUtils.readShort(buffer);
-    }
-
-    protected void writeShort(ByteBuffer buffer, short s)
-    {
-        EncodingUtils.writeShort(buffer, s);
-    }
-
-    protected Content readContent(ByteBuffer buffer)
-    {
-        return null;  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected int getSizeOf(Content body)
-    {
-        return 0;  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeContent(ByteBuffer buffer, Content body)
-    {
-        //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected byte readBitfield(ByteBuffer buffer)
-    {
-        return readByte(buffer);  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected int readUnsignedShort(ByteBuffer buffer)
-    {
-        return buffer.getUnsignedShort();  //To change body of created methods use File | Settings | File Templates.
-    }
-
-    protected void writeBitfield(ByteBuffer buffer, byte bitfield0)
-    {
-        buffer.put(bitfield0);
-    }
-
-    protected void writeUnsignedShort(ByteBuffer buffer, int s)
-    {
-        EncodingUtils.writeUnsignedShort(buffer, s);
-    }
-
-    protected long readUnsignedInteger(ByteBuffer buffer)
-    {
-        return buffer.getUnsignedInt();
-    }
-    protected void writeUnsignedInteger(ByteBuffer buffer, long i)
-    {
-        EncodingUtils.writeUnsignedInteger(buffer, i);
-    }
-
-
-    protected short readUnsignedByte(ByteBuffer buffer)
-    {
-        return buffer.getUnsigned();
-    }
-
-    protected void writeUnsignedByte(ByteBuffer buffer, short unsignedByte)
-    {
-        EncodingUtils.writeUnsignedByte(buffer, unsignedByte);
-    }
-
-    protected long readTimestamp(ByteBuffer buffer)
-    {
-        return EncodingUtils.readTimestamp(buffer);
-    }
-
-    protected void writeTimestamp(ByteBuffer buffer, long t)
-    {
-        EncodingUtils.writeTimestamp(buffer, t);
-    }
         
 
 }