http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
index 50c9a3c..dda97e8 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
@@ -30,26 +30,32 @@ public final class SessionDetached extends Method {
 
     public static final int TYPE = 516;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L2;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -83,6 +89,7 @@ public final class SessionDetached extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionDetached(context, this);
     }
@@ -143,6 +150,7 @@ public final class SessionDetached extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class SessionDetached extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class SessionDetached extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
index b5e86c1..6e74632 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
@@ -30,26 +30,32 @@ public final class SessionExpected extends Method {
 
     public static final int TYPE = 520;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -83,6 +89,7 @@ public final class SessionExpected extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionExpected(context, this);
     }
@@ -143,6 +150,7 @@ public final class SessionExpected extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class SessionExpected extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class SessionExpected extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
index 4341efa..2f79651 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
@@ -30,26 +30,32 @@ public final class SessionFlush extends Method {
 
     public static final int TYPE = 524;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -78,6 +84,7 @@ public final class SessionFlush extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionFlush(context, this);
     }
@@ -188,18 +195,21 @@ public final class SessionFlush extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
index f2a880b..1c37926 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
@@ -30,26 +30,32 @@ public final class SessionGap extends Method {
 
     public static final int TYPE = 525;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -79,6 +85,7 @@ public final class SessionGap extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionGap(context, this);
     }
@@ -113,6 +120,7 @@ public final class SessionGap extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class SessionGap extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class SessionGap extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
index 7ea4929..3533f04 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
@@ -30,14 +30,17 @@ public final class SessionHeader extends Struct {
 
     public static final int TYPE = -1;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 1;
     }
 
+    @Override
     public final int getPackWidth() {
         return 1;
     }
@@ -113,18 +116,21 @@ public final class SessionHeader extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint8(packing_flags);
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (byte) dec.readUint8();
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
index 1d65fb0..3b4d59c 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
@@ -30,26 +30,32 @@ public final class SessionKnownCompleted extends Method {
 
     public static final int TYPE = 523;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -79,6 +85,7 @@ public final class SessionKnownCompleted extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionKnownCompleted(context, this);
     }
@@ -113,6 +120,7 @@ public final class SessionKnownCompleted extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class SessionKnownCompleted extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class SessionKnownCompleted extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
index 56c7430..229305f 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
@@ -30,26 +30,32 @@ public final class SessionRequestTimeout extends Method {
 
     public static final int TYPE = 517;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -77,6 +83,7 @@ public final class SessionRequestTimeout extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionRequestTimeout(context, this);
     }
@@ -111,6 +118,7 @@ public final class SessionRequestTimeout extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -121,6 +129,7 @@ public final class SessionRequestTimeout extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -131,6 +140,7 @@ public final class SessionRequestTimeout extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
index 57c5c9a..115650b 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
@@ -30,26 +30,32 @@ public final class SessionTimeout extends Method {
 
     public static final int TYPE = 518;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L3;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -77,6 +83,7 @@ public final class SessionTimeout extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionTimeout(context, this);
     }
@@ -111,6 +118,7 @@ public final class SessionTimeout extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -121,6 +129,7 @@ public final class SessionTimeout extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -131,6 +140,7 @@ public final class SessionTimeout extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
index 1d5ea1f..7f487a4 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
@@ -105,14 +105,17 @@ public abstract class Struct implements Encodable
         return getFlagCount() - getFields().size();
     }
 
+    @Override
     public abstract void read(Decoder dec);
 
+    @Override
     public abstract void write(Encoder enc);
 
     public abstract Map<String,Object> getFields();
 
     public abstract int getEncodedLength();
 
+    @Override
     public String toString()
     {
         StringBuilder str = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
index ea223c7..a131ea4 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
@@ -30,26 +30,32 @@ public final class TxCommit extends Method {
 
     public static final int TYPE = 1282;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L4;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -74,6 +80,7 @@ public final class TxCommit extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.txCommit(context, this);
     }
@@ -82,18 +89,21 @@ public final class TxCommit extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
index 38c7afb..9ab4f41 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
@@ -30,26 +30,32 @@ public final class TxRollback extends Method {
 
     public static final int TYPE = 1283;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L4;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -74,6 +80,7 @@ public final class TxRollback extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.txRollback(context, this);
     }
@@ -82,18 +89,21 @@ public final class TxRollback extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
index d889e8c..da6523e 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
@@ -30,26 +30,32 @@ public final class TxSelect extends Method {
 
     public static final int TYPE = 1281;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
 
+    @Override
     public final boolean hasPayload() {
         return false;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L4;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -74,6 +80,7 @@ public final class TxSelect extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.txSelect(context, this);
     }
@@ -82,18 +89,21 @@ public final class TxSelect extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
index b2ded1d..4190c9d 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
@@ -30,14 +30,17 @@ public final class XaResult extends Struct {
 
     public static final int TYPE = 1537;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -101,6 +104,7 @@ public final class XaResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -111,6 +115,7 @@ public final class XaResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -121,6 +126,7 @@ public final class XaResult extends Struct {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
index e1087b7..e5f870c 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
@@ -30,14 +30,17 @@ public final class Xid extends Struct {
 
     public static final int TYPE = 1540;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -159,6 +162,7 @@ public final class Xid extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -177,6 +181,7 @@ public final class Xid extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -195,6 +200,7 @@ public final class Xid extends Struct {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
 
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
index 1dc410e..6ee24a3 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
@@ -68,6 +68,7 @@ public class ServerSessionDelegateTest extends QpidTestCase
 
         verify(_session).invoke(argThat(new 
ArgumentMatcher<ExecutionException>()
         {
+            @Override
             public boolean matches(Object object)
             {
                 ExecutionException exception = (ExecutionException)object;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
 
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
index a285558..1052cc5 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
@@ -31,6 +31,7 @@ public class WindowCreditManagerTest extends QpidTestCase
     private WindowCreditManager _creditManager;
     private ProtocolEngine _protocolEngine;
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 0da0063..91d92b4 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -1461,6 +1461,7 @@ public class AMQChannel extends 
AbstractAMQPSession<AMQChannel, ConsumerTarget_0
             _reference.release();
         }
 
+        @Override
         public void onRollback()
         {
             _reference.release();
@@ -3405,6 +3406,7 @@ public class AMQChannel extends 
AbstractAMQPSession<AMQChannel, ConsumerTarget_0
         Runnable task = new Runnable()
         {
 
+            @Override
             public void run()
             {
                 _connection.writeFrame(responseBody.generateFrame(_channelId));
@@ -3479,6 +3481,7 @@ public class AMQChannel extends 
AbstractAMQPSession<AMQChannel, ConsumerTarget_0
         }
     }
 
+    @Override
     protected void updateBlockedStateIfNecessary()
     {
         boolean desiredBlockingState = _blocking.get();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
index aaf22a2..7dd94e2 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
@@ -58,6 +58,7 @@ public class AMQMessage extends 
AbstractServerMessageImpl<AMQMessage, MessageMet
         return getMessageMetaData().getContentHeaderBody();
     }
 
+    @Override
     public String getInitialRoutingAddress()
     {
         MessageMetaData messageMetaData = getMessageMetaData();
@@ -72,6 +73,7 @@ public class AMQMessage extends 
AbstractServerMessageImpl<AMQMessage, MessageMet
         return "";
     }
 
+    @Override
     public AMQMessageHeader getMessageHeader()
     {
         return getMessageMetaData().getMessageHeader();
@@ -82,6 +84,7 @@ public class AMQMessage extends 
AbstractServerMessageImpl<AMQMessage, MessageMet
         return getMessageMetaData().getMessagePublishInfo();
     }
 
+    @Override
     public long getArrivalTime()
     {
         return getMessageMetaData().getArrivalTime();
@@ -103,6 +106,7 @@ public class AMQMessage extends 
AbstractServerMessageImpl<AMQMessage, MessageMet
         return getMessagePublishInfo().isMandatory();
     }
 
+    @Override
     public long getExpiration()
     {
         return getMessageHeader().getExpiration();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
index ed47622..57b9bdd 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
@@ -326,11 +326,13 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
         return _targetAddress;
     }
 
+    @Override
     public AMQChannel getSession()
     {
         return _channel;
     }
 
+    @Override
     public String toString()
     {
 
@@ -362,6 +364,7 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
         return _creditManager;
     }
 
+    @Override
     public boolean allocateCredit(ServerMessage msg)
     {
         boolean hasCredit = _creditManager.hasCredit();
@@ -388,6 +391,7 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
         return _channel.getConnection();
     }
 
+    @Override
     public void restoreCredit(final ServerMessage message)
     {
         // This method is only called when the queue is restoring credit it 
allocated and then could not use
@@ -410,6 +414,7 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
         converter.confirmConsumerAutoClose(getChannel().getChannelId(), 
getConsumerTag());
     }
 
+    @Override
     public void queueEmpty()
     {
         if(isAutoClose() && getState() != State.CLOSED)
@@ -419,6 +424,7 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
         }
     }
 
+    @Override
     public void flushBatched()
     {
         _channel.getConnection().setDeferFlush(false);
@@ -442,11 +448,13 @@ public abstract class ConsumerTarget_0_8 extends 
AbstractConsumerTarget<Consumer
     {
     }
 
+    @Override
     public long getUnacknowledgedBytes()
     {
         return _unacknowledgedBytes.longValue();
     }
 
+    @Override
     public long getUnacknowledgedMessages()
     {
         return _unacknowledgedCount.longValue();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
index 36a4f30..e707d7b 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
@@ -28,15 +28,18 @@ public class InfiniteCreditCreditManager implements 
FlowCreditManager_0_8
     {
     }
 
+    @Override
     public void restoreCredit(long messageCredit, long bytesCredit)
     {
     }
 
+    @Override
     public boolean hasCredit()
     {
         return true;
     }
 
+    @Override
     public boolean useCreditForMessage(long msgSize)
     {
         return true;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
index dc8e2e8..82bbb29 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
@@ -42,6 +42,7 @@ public class MessageConverter_Internal_to_v0_8 implements 
MessageConverter<Inter
 {
 
 
+    @Override
     public Class<InternalMessage> getInputClass()
     {
         return InternalMessage.class;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
index 1c14a70..00953b9 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
@@ -82,11 +82,13 @@ public class MessageMetaData implements 
StorableMessageMetaData
         return _arrivalTime;
     }
 
+    @Override
     public MessageMetaDataType getType()
     {
         return TYPE;
     }
 
+    @Override
     public int getStorableSize()
     {
         int size = _contentHeaderBody.getSize();
@@ -100,6 +102,7 @@ public class MessageMetaData implements 
StorableMessageMetaData
     }
 
 
+    @Override
     public void writeToBuffer(final QpidByteBuffer dest)
     {
         dest.putInt(_contentHeaderBody.getSize());
@@ -121,11 +124,13 @@ public class MessageMetaData implements 
StorableMessageMetaData
 
     }
 
+    @Override
     public int getContentSize()
     {
         return (int) _contentHeaderBody.getBodySize();
     }
 
+    @Override
     public boolean isPersistent()
     {
         return _contentHeaderBody.getProperties().getDeliveryMode() ==  
BasicContentHeaderProperties.PERSISTENT;
@@ -137,6 +142,7 @@ public class MessageMetaData implements 
StorableMessageMetaData
         _contentHeaderBody.dispose();
     }
 
+    @Override
     public synchronized void clearEncodedForm()
     {
         _contentHeaderBody.clearEncodedForm();
@@ -222,56 +228,67 @@ public class MessageMetaData implements 
StorableMessageMetaData
             return getContentHeaderBody().getProperties();
         }
 
+        @Override
         public String getUserId()
         {
             return getProperties().getUserIdAsString();
         }
 
+        @Override
         public String getAppId()
         {
             return getProperties().getAppIdAsString();
         }
 
+        @Override
         public String getCorrelationId()
         {
             return getProperties().getCorrelationIdAsString();
         }
 
+        @Override
         public long getExpiration()
         {
             return getProperties().getExpiration();
         }
 
+        @Override
         public String getMessageId()
         {
             return getProperties().getMessageIdAsString();
         }
 
+        @Override
         public String getMimeType()
         {
             return getProperties().getContentTypeAsString();
         }
 
+        @Override
         public String getEncoding()
         {
             return getProperties().getEncodingAsString();
         }
 
+        @Override
         public byte getPriority()
         {
             return getProperties().getPriority();
         }
 
+        @Override
         public long getTimestamp()
         {
             return getProperties().getTimestamp();
         }
 
+        @Override
         public String getType()
         {
             return getProperties().getTypeAsString();
         }
 
+        @Override
         public String getReplyTo()
         {
             return getProperties().getReplyToAsString();
@@ -284,12 +301,14 @@ public class MessageMetaData implements 
StorableMessageMetaData
             return header instanceof Number ? ((Number)header).longValue() : 
0L;
         }
 
+        @Override
         public Object getHeader(String name)
         {
             FieldTable ft = getProperties().getHeaders();
             return ft.get(name);
         }
 
+        @Override
         public boolean containsHeaders(Set<String> names)
         {
             FieldTable ft = getProperties().getHeaders();
@@ -309,6 +328,7 @@ public class MessageMetaData implements 
StorableMessageMetaData
             return getProperties().getHeaders().keys();
         }
 
+        @Override
         public boolean containsHeader(String name)
         {
             FieldTable ft = getProperties().getHeaders();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManager.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManager.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManager.java
index 231549c..02cd899 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManager.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManager.java
@@ -65,6 +65,7 @@ class Pre0_10CreditManager implements FlowCreditManager_0_8
         _messageCreditLimit = messageCreditLimit;
     }
 
+    @Override
     public void restoreCredit(final long messageCredit, final long bytesCredit)
     {
         _messageCredit += messageCredit;
@@ -86,12 +87,14 @@ class Pre0_10CreditManager implements FlowCreditManager_0_8
         }
     }
 
+    @Override
     public boolean hasCredit()
     {
         return (_bytesCreditLimit == 0L || _bytesCredit > 0)
                && (_messageCreditLimit == 0L || _messageCredit > 0);
     }
 
+    @Override
     public boolean useCreditForMessage(final long msgSize)
     {
         if (_messageCreditLimit != 0)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
index d963543..14a1e20 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
@@ -49,16 +49,19 @@ public class ProtocolEngineCreator_0_8 implements 
ProtocolEngineCreator
     {
     }
 
+    @Override
     public Protocol getVersion()
     {
         return Protocol.AMQP_0_8;
     }
 
+    @Override
     public byte[] getHeaderIdentifier()
     {
         return AMQP_0_8_HEADER;
     }
 
+    @Override
     public ProtocolEngine newProtocolEngine(Broker<?> broker,
                                             ServerNetworkConnection network,
                                             AmqpPort<?> port,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
index 6f5caed..f1a1d85 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
@@ -48,17 +48,20 @@ public class ProtocolEngineCreator_0_9 implements 
ProtocolEngineCreator
     {
     }
 
+    @Override
     public Protocol getVersion()
     {
         return Protocol.AMQP_0_9;
     }
 
 
+    @Override
     public byte[] getHeaderIdentifier()
     {
         return AMQP_0_9_HEADER;
     }
 
+    @Override
     public ProtocolEngine newProtocolEngine(Broker<?> broker,
                                             ServerNetworkConnection network,
                                             AmqpPort<?> port,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
index 2648669..46fe5ba 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
@@ -49,17 +49,20 @@ public class ProtocolEngineCreator_0_9_1 implements 
ProtocolEngineCreator
     {
     }
 
+    @Override
     public Protocol getVersion()
     {
         return Protocol.AMQP_0_9_1;
     }
 
 
+    @Override
     public byte[] getHeaderIdentifier()
     {
         return AMQP_0_9_1_HEADER;
     }
 
+    @Override
     public ProtocolEngine newProtocolEngine(Broker<?> broker,
                                             ServerNetworkConnection network,
                                             AmqpPort<?> port,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
index a11bd16..e1f283a 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
@@ -60,6 +60,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
     }
 
 
+    @Override
     public long writeDeliver(final ServerMessage m,
                              final InstanceProperties props, int channelId,
                              long deliveryTag,
@@ -262,11 +263,13 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
             _length = length;
         }
 
+        @Override
         public byte getFrameType()
         {
             return TYPE;
         }
 
+        @Override
         public int getSize()
         {
             return _length;
@@ -286,6 +289,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
             return size;
         }
 
+        @Override
         public void handle(int channelId, AMQVersionAwareProtocolSession 
amqProtocolSession) throws QpidException
         {
             throw new UnsupportedOperationException();
@@ -299,6 +303,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
 
     }
 
+    @Override
     public long writeGetOk(final ServerMessage msg,
                            final InstanceProperties props,
                            int channelId,
@@ -369,11 +374,13 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
                                                                                
_routingKey);
         }
 
+        @Override
         public byte getFrameType()
         {
             return AMQMethodBody.TYPE;
         }
 
+        @Override
         public int getSize()
         {
             if(_underlyingBody == null)
@@ -383,6 +390,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
             return _underlyingBody.getSize();
         }
 
+        @Override
         public long writePayload(ByteBufferSender sender)
         {
             if(_underlyingBody == null)
@@ -392,6 +400,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
             return _underlyingBody.writePayload(sender);
         }
 
+        @Override
         public void handle(final int channelId, final 
AMQVersionAwareProtocolSession amqProtocolSession)
             throws QpidException
         {
@@ -435,6 +444,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
                                                              
messagePublishInfo.getRoutingKey());
     }
 
+    @Override
     public void writeReturn(MessagePublishInfo messagePublishInfo, 
ContentHeaderBody header, MessageContentSource message, int channelId, int 
replyCode, AMQShortString replyText)
     {
 
@@ -444,12 +454,14 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
     }
 
 
+    @Override
     public void writeFrame(AMQDataBlock block)
     {
         _connection.writeFrame(block);
     }
 
 
+    @Override
     public void confirmConsumerAutoClose(int channelId, AMQShortString 
consumerTag)
     {
 
@@ -477,6 +489,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
             _contentBody = contentBody;
         }
 
+        @Override
         public long getSize()
         {
             return OVERHEAD + (long)_methodBody.getSize() + 
(long)_headerBody.getSize() + (long)_contentBody.getSize();
@@ -525,6 +538,7 @@ public class ProtocolOutputConverterImpl implements 
ProtocolOutputConverter
 
         }
 
+        @Override
         public long getSize()
         {
             return OVERHEAD + (long)_methodBody.getSize() + 
(long)_headerBody.getSize() ;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
index a8dd188..08ccda9 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
@@ -45,6 +45,7 @@ public class ServerDecoder extends 
AMQDecoder<ServerMethodProcessor<? extends Se
     }
 
 
+    @Override
     void processMethod(int channelId,
                        QpidByteBuffer in)
             throws AMQFrameDecodingException

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
index bcf01e1..4fde4f3 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
@@ -37,6 +37,7 @@ public class AMQFrame extends AMQDataBlock implements 
EncodableAMQDataBlock
         _bodyFrame = bodyFrame;
     }
 
+    @Override
     public long getSize()
     {
         return 1 + 2 + 4 + _bodyFrame.getSize() + 1;
@@ -84,6 +85,7 @@ public class AMQFrame extends AMQDataBlock implements 
EncodableAMQDataBlock
         return _bodyFrame;
     }
 
+    @Override
     public String toString()
     {
         return "Frame channelId: " + _channel + ", bodyFrame: " + 
String.valueOf(_bodyFrame);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
index f1b1e96..acc6cf9 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
@@ -32,10 +32,12 @@ public interface AMQMethodBody extends AMQBody
     /** @return unsigned short */
     int getMethod();
 
+    @Override
     int getSize();
 
     AMQFrame generateFrame(int channelId);
 
+    @Override
     String toString();
 
     boolean execute(MethodDispatcher methodDispatcher, int channelId) throws 
QpidException;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
index 1191f1b..9f1fa38 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
@@ -39,6 +39,7 @@ public abstract class AMQMethodBodyImpl implements 
AMQMethodBody
     {
     }
 
+    @Override
     public byte getFrameType()
     {
         return TYPE;
@@ -51,6 +52,7 @@ public abstract class AMQMethodBodyImpl implements 
AMQMethodBody
     abstract protected int getBodySize();
 
 
+    @Override
     public AMQFrame generateFrame(int channelId)
     {
         return new AMQFrame(channelId, this);
@@ -61,11 +63,13 @@ public abstract class AMQMethodBodyImpl implements 
AMQMethodBody
      * method ids of the body it resulted from).
      */
 
+    @Override
     public void handle(final int channelId, final 
AMQVersionAwareProtocolSession session) throws QpidException
     {
         session.methodFrameReceived(channelId, this);
     }
 
+    @Override
     public int getSize()
     {
         return 2 + 2 + getBodySize();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
index 4248778..ad9db5e 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
@@ -78,6 +78,7 @@ public class AMQMethodEvent<M extends AMQMethodBody>
      *
      * @return The method call as a string, mainly for debugging purposes.
      */
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("Method event: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
index 188a44f..894804e 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
@@ -79,11 +79,13 @@ public class AccessRequestBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -114,6 +116,7 @@ public class AccessRequestBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return (((int)(_bitfield0)) & ( 1 << 4)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 1;
@@ -121,17 +124,20 @@ public class AccessRequestBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _realm );
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchAccessRequest(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[AccessRequestBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
index 9fe6071..329b1ff 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
@@ -46,11 +46,13 @@ public class AccessRequestOkBody extends AMQMethodBodyImpl 
implements EncodableA
         _ticket = ticket;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -61,22 +63,26 @@ public class AccessRequestOkBody extends AMQMethodBodyImpl 
implements EncodableA
         return _ticket;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 2;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeUnsignedShort( buffer, _ticket );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchAccessRequestOk(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[AccessRequestOkBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
index 805f7fe..359540b 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
@@ -54,11 +54,13 @@ public class BasicAckBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -73,23 +75,27 @@ public class BasicAckBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 9;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeLong( buffer, _deliveryTag );
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicAck(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicAckBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
index fac898f..9ddb1b0 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
@@ -55,11 +55,13 @@ public class BasicCancelBody extends AMQMethodBodyImpl 
implements EncodableAMQDa
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -74,6 +76,7 @@ public class BasicCancelBody extends AMQMethodBodyImpl 
implements EncodableAMQDa
         return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 1;
@@ -81,17 +84,20 @@ public class BasicCancelBody extends AMQMethodBodyImpl 
implements EncodableAMQDa
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _consumerTag );
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicCancel(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicCancelBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
index 77a13a7..05ae218 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
@@ -47,11 +47,13 @@ public class BasicCancelOkBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         _consumerTag = consumerTag;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -62,6 +64,7 @@ public class BasicCancelOkBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return _consumerTag;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 0;
@@ -69,16 +72,19 @@ public class BasicCancelOkBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _consumerTag );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicCancelOk(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicCancelOkBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
index b66c59d..4249e51 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
@@ -86,11 +86,13 @@ public class BasicConsumeBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         _arguments = arguments;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -129,6 +131,7 @@ public class BasicConsumeBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return _arguments;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 3;
@@ -138,6 +141,7 @@ public class BasicConsumeBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeUnsignedShort( buffer, _ticket );
@@ -147,11 +151,13 @@ public class BasicConsumeBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         writeFieldTable( buffer, _arguments );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicConsume(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicConsumeBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
index a9e1fb8..ec61cd8 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
@@ -47,11 +47,13 @@ public class BasicConsumeOkBody extends AMQMethodBodyImpl 
implements EncodableAM
         _consumerTag = consumerTag;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -62,6 +64,7 @@ public class BasicConsumeOkBody extends AMQMethodBodyImpl 
implements EncodableAM
         return _consumerTag;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 0;
@@ -69,16 +72,19 @@ public class BasicConsumeOkBody extends AMQMethodBodyImpl 
implements EncodableAM
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _consumerTag );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicConsumeOk(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicConsumeOkBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
index e7e8f92..ef83d60 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
@@ -65,11 +65,13 @@ public class BasicDeliverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         _routingKey = routingKey;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -96,6 +98,7 @@ public class BasicDeliverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return _routingKey;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 9;
@@ -105,6 +108,7 @@ public class BasicDeliverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _consumerTag );
@@ -114,11 +118,13 @@ public class BasicDeliverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         writeAMQShortString( buffer, _routingKey );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicDeliver(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicDeliverBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
index 7fa297e..1a88b51 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
@@ -58,11 +58,13 @@ public class BasicGetBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -81,6 +83,7 @@ public class BasicGetBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 3;
@@ -88,6 +91,7 @@ public class BasicGetBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeUnsignedShort( buffer, _ticket );
@@ -95,11 +99,13 @@ public class BasicGetBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicGet(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicGetBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
index 15bfe6b..8b0d749 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
@@ -47,11 +47,13 @@ public class BasicGetEmptyBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         _clusterId = clusterId;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -62,6 +64,7 @@ public class BasicGetEmptyBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return _clusterId;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 0;
@@ -69,16 +72,19 @@ public class BasicGetEmptyBody extends AMQMethodBodyImpl 
implements EncodableAMQ
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeAMQShortString( buffer, _clusterId );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicGetEmpty(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicGetEmptyBody: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
index f533d32..17f4596 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
@@ -65,11 +65,13 @@ public class BasicGetOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
         _messageCount = messageCount;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -96,6 +98,7 @@ public class BasicGetOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
         return _messageCount;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 13;
@@ -104,6 +107,7 @@ public class BasicGetOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeLong( buffer, _deliveryTag );
@@ -113,11 +117,13 @@ public class BasicGetOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
         writeUnsignedInteger( buffer, _messageCount );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicGetOk(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicGetOkBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
index 0934701..982e6df 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
@@ -60,11 +60,13 @@ public class BasicNackBody extends AMQMethodBodyImpl 
implements EncodableAMQData
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -85,23 +87,27 @@ public class BasicNackBody extends AMQMethodBodyImpl 
implements EncodableAMQData
         return (((int)(_bitfield0)) &  2 ) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 9;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeLong( buffer, _deliveryTag );
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicNack(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicNackBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
index 4b2f8ca..9821383 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
@@ -67,11 +67,13 @@ public class BasicPublishBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -98,6 +100,7 @@ public class BasicPublishBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return (((int)(_bitfield0)) & ( 1 << 1)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 3;
@@ -106,6 +109,7 @@ public class BasicPublishBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeUnsignedShort( buffer, _ticket );
@@ -114,11 +118,13 @@ public class BasicPublishBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicPublish(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicPublishBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
index 145a0d1..cd3b876 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
@@ -57,11 +57,13 @@ public class BasicQosBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -80,12 +82,14 @@ public class BasicQosBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 7;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeUnsignedInteger( buffer, _prefetchSize );
@@ -93,11 +97,13 @@ public class BasicQosBody extends AMQMethodBodyImpl 
implements EncodableAMQDataB
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicQos(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicQosBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
index f75cc70..6707495 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
@@ -43,32 +43,38 @@ public class BasicQosOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
     {
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
     }
 
 
+    @Override
     protected int getBodySize()
     {
         int size = 0;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicQosOk(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicQosOkBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
index 65dc41f..e877e7f 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
@@ -52,11 +52,13 @@ public class BasicRecoverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         _bitfield0 = bitfield0;
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
@@ -67,22 +69,26 @@ public class BasicRecoverBody extends AMQMethodBodyImpl 
implements EncodableAMQD
         return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
     }
 
+    @Override
     protected int getBodySize()
     {
         int size = 1;
         return size;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
         writeBitfield( buffer, _bitfield0 );
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
        {
         return dispatcher.dispatchBasicRecover(this, channelId);
        }
 
+    @Override
     public String toString()
     {
         StringBuilder buf = new StringBuilder("[BasicRecoverBodyImpl: ");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to