You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2017/07/18 10:03:47 UTC

[06/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

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/ExchangeUnbind.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
index 30b738c..781e8d1 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
@@ -30,26 +30,32 @@ public final class ExchangeUnbind extends Method {
 
     public static final int TYPE = 1797;
 
+    @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;
@@ -87,6 +93,7 @@ public final class ExchangeUnbind extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeUnbind(context, this);
     }
@@ -173,6 +180,7 @@ public final class ExchangeUnbind extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -191,6 +199,7 @@ public final class ExchangeUnbind extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -209,6 +218,7 @@ public final class ExchangeUnbind 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/ExecutionException.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
index 513bedf..f8e14b7 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
@@ -30,26 +30,32 @@ public final class ExecutionException extends Method {
 
     public static final int TYPE = 771;
 
+    @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;
@@ -95,6 +101,7 @@ public final class ExecutionException extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.executionException(context, this);
     }
@@ -285,6 +292,7 @@ public final class ExecutionException extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -319,6 +327,7 @@ public final class ExecutionException extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -353,6 +362,7 @@ public final class ExecutionException 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/ExecutionResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
index 672654c..1c2ba44 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
@@ -30,26 +30,32 @@ public final class ExecutionResult extends Method {
 
     public static final int TYPE = 770;
 
+    @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;
@@ -81,6 +87,7 @@ public final class ExecutionResult extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.executionResult(context, this);
     }
@@ -141,6 +148,7 @@ public final class ExecutionResult extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -155,6 +163,7 @@ public final class ExecutionResult extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -169,6 +178,7 @@ public final class ExecutionResult 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/ExecutionSync.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
index 430b8a7..aecdc0b 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
@@ -30,26 +30,32 @@ public final class ExecutionSync extends Method {
 
     public static final int TYPE = 769;
 
+    @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 ExecutionSync extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.executionSync(context, this);
     }
@@ -82,18 +89,21 @@ public final class ExecutionSync 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/FragmentProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
index 3260363..bb38394 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
@@ -30,14 +30,17 @@ public final class FragmentProperties extends Struct {
 
     public static final int TYPE = 1026;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -176,6 +179,7 @@ public final class FragmentProperties extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -186,6 +190,7 @@ public final class FragmentProperties extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -196,6 +201,7 @@ public final class FragmentProperties 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/Frame.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Frame.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Frame.java
index 56abcfe..87c47a2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Frame.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Frame.java
@@ -121,11 +121,13 @@ public final class Frame implements NetworkEvent
         return flag(LAST_FRAME);
     }
 
+    @Override
     public void delegate(NetworkDelegate delegate)
     {
         delegate.frame(this);
     }
 
+    @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/GetTimeoutResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
index f86eff0..d8b38cc 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
@@ -30,14 +30,17 @@ public final class GetTimeoutResult extends Struct {
 
     public static final int TYPE = 1538;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -99,6 +102,7 @@ public final class GetTimeoutResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -109,6 +113,7 @@ public final class GetTimeoutResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -119,6 +124,7 @@ public final class GetTimeoutResult 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/Header.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Header.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Header.java
index 1c18536..c6a6289 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Header.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Header.java
@@ -99,6 +99,7 @@ public class Header
         return _nonStandardProps;
     }
 
+    @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/MessageAccept.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
index cdffaf7..3f02d19 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
@@ -30,26 +30,32 @@ public final class MessageAccept extends Method {
 
     public static final int TYPE = 1026;
 
+    @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;
@@ -79,6 +85,7 @@ public final class MessageAccept extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageAccept(context, this);
     }
@@ -113,6 +120,7 @@ public final class MessageAccept extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class MessageAccept extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class MessageAccept 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/MessageAcquire.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
index 6fe6369..9fb18c2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
@@ -30,26 +30,32 @@ public final class MessageAcquire extends Method {
 
     public static final int TYPE = 1029;
 
+    @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;
@@ -79,6 +85,7 @@ public final class MessageAcquire extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageAcquire(context, this);
     }
@@ -113,6 +120,7 @@ public final class MessageAcquire extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class MessageAcquire extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class MessageAcquire 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/MessageCancel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
index 394591a..d6eec67 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
@@ -30,26 +30,32 @@ public final class MessageCancel extends Method {
 
     public static final int TYPE = 1032;
 
+    @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;
@@ -79,6 +85,7 @@ public final class MessageCancel extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageCancel(context, this);
     }
@@ -113,6 +120,7 @@ public final class MessageCancel extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class MessageCancel extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class MessageCancel 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/MessageFlow.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
index b2c35af..41ebd5d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
@@ -30,26 +30,32 @@ public final class MessageFlow extends Method {
 
     public static final int TYPE = 1034;
 
+    @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;
@@ -85,6 +91,7 @@ public final class MessageFlow extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageFlow(context, this);
     }
@@ -171,6 +178,7 @@ public final class MessageFlow extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -189,6 +197,7 @@ public final class MessageFlow extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -207,6 +216,7 @@ public final class MessageFlow 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/MessageFlush.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
index 39d213f..acfb162 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
@@ -30,26 +30,32 @@ public final class MessageFlush extends Method {
 
     public static final int TYPE = 1035;
 
+    @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;
@@ -79,6 +85,7 @@ public final class MessageFlush extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageFlush(context, this);
     }
@@ -113,6 +120,7 @@ public final class MessageFlush extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class MessageFlush extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class MessageFlush 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/MessageProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
index e328a6a..6c572b2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
@@ -30,14 +30,17 @@ public final class MessageProperties extends Struct {
 
     public static final int TYPE = 1027;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -347,6 +350,7 @@ public final class MessageProperties extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -435,6 +439,7 @@ public final class MessageProperties extends Struct {
         return len;
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -477,6 +482,7 @@ public final class MessageProperties 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/MessageReject.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
index 41dd089..ad6cde9 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
@@ -30,26 +30,32 @@ public final class MessageReject extends Method {
 
     public static final int TYPE = 1027;
 
+    @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;
@@ -87,6 +93,7 @@ public final class MessageReject extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageReject(context, this);
     }
@@ -173,6 +180,7 @@ public final class MessageReject extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -191,6 +199,7 @@ public final class MessageReject extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -209,6 +218,7 @@ public final class MessageReject 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/MessageRelease.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
index e7fdacf..eb283bc 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
@@ -30,26 +30,32 @@ public final class MessageRelease extends Method {
 
     public static final int TYPE = 1028;
 
+    @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;
@@ -80,6 +86,7 @@ public final class MessageRelease extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageRelease(context, this);
     }
@@ -148,6 +155,7 @@ public final class MessageRelease extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -158,6 +166,7 @@ public final class MessageRelease extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -168,6 +177,7 @@ public final class MessageRelease 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/MessageResume.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
index 0d9fb9b..1ea6939 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
@@ -30,26 +30,32 @@ public final class MessageResume extends Method {
 
     public static final int TYPE = 1030;
 
+    @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;
@@ -83,6 +89,7 @@ public final class MessageResume extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageResume(context, this);
     }
@@ -143,6 +150,7 @@ public final class MessageResume extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class MessageResume extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class MessageResume 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/MessageResumeResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
index 72ed8c8..cb39649 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
@@ -30,14 +30,17 @@ public final class MessageResumeResult extends Struct {
 
     public static final int TYPE = 1029;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -99,6 +102,7 @@ public final class MessageResumeResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -109,6 +113,7 @@ public final class MessageResumeResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -119,6 +124,7 @@ public final class MessageResumeResult 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/MessageSetFlowMode.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
index 091b3bd..aaa412d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
@@ -30,26 +30,32 @@ public final class MessageSetFlowMode extends Method {
 
     public static final int TYPE = 1033;
 
+    @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;
@@ -83,6 +89,7 @@ public final class MessageSetFlowMode extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageSetFlowMode(context, this);
     }
@@ -143,6 +150,7 @@ public final class MessageSetFlowMode extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class MessageSetFlowMode extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class MessageSetFlowMode 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/MessageStop.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
index d015b51..ee62dca 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
@@ -30,26 +30,32 @@ public final class MessageStop extends Method {
 
     public static final int TYPE = 1036;
 
+    @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;
@@ -79,6 +85,7 @@ public final class MessageStop extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageStop(context, this);
     }
@@ -113,6 +120,7 @@ public final class MessageStop extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class MessageStop extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class MessageStop 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/MessageSubscribe.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
index 87b3389..88d4e88 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
@@ -30,26 +30,32 @@ public final class MessageSubscribe extends Method {
 
     public static final int TYPE = 1031;
 
+    @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;
@@ -102,6 +108,7 @@ public final class MessageSubscribe extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageSubscribe(context, this);
     }
@@ -326,6 +333,7 @@ public final class MessageSubscribe extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -360,6 +368,7 @@ public final class MessageSubscribe extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -394,6 +403,7 @@ public final class MessageSubscribe 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/MessageTransfer.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
index fc87590..7494bda 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
@@ -39,26 +39,32 @@ public final class MessageTransfer extends Method {
     public static final int TYPE = 1025;
     private int _bodySize;
 
+    @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 true;
     }
 
+    @Override
     public final byte getEncodedTrack() {
         return Frame.L4;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return false;
@@ -109,6 +115,7 @@ public final class MessageTransfer extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.messageTransfer(context, this);
     }
@@ -193,10 +200,12 @@ public final class MessageTransfer extends Method {
     }
 
 
+    @Override
     public final Header getHeader() {
         return this.header;
     }
 
+    @Override
     public final void setHeader(Header header) {
         this.header = header;
     }
@@ -275,6 +284,7 @@ public final class MessageTransfer extends Method {
     }
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -293,6 +303,7 @@ public final class MessageTransfer extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -311,6 +322,7 @@ public final class MessageTransfer 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/Method.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Method.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Method.java
index bd97db3..8fffac3 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Method.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Method.java
@@ -72,11 +72,13 @@ public abstract class Method extends Struct implements ProtocolEvent
         return idSet;
     }
 
+    @Override
     public final int getChannel()
     {
         return channel;
     }
 
+    @Override
     public final void setChannel(int channel)
     {
         this.channel = channel;
@@ -140,10 +142,12 @@ public abstract class Method extends Struct implements ProtocolEvent
 
     }
 
+    @Override
     public abstract byte getEncodedTrack();
 
     public abstract <C> void dispatch(C context, MethodDelegate<C> delegate);
 
+    @Override
     public <C> void delegate(C context, ProtocolDelegate<C> delegate)
     {
         if (getEncodedTrack() == Frame.L4)
@@ -182,6 +186,7 @@ public abstract class Method extends Struct implements ProtocolEvent
         throw new UnsupportedOperationException();
     }
 
+    @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/ProtocolError.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolError.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolError.java
index e7a91ff..0916e8d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolError.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolError.java
@@ -42,21 +42,25 @@ public final class ProtocolError implements NetworkEvent, ProtocolEvent
         this.args = args;
     }
 
+    @Override
     public int getChannel()
     {
         return channel;
     }
 
+    @Override
     public void setChannel(int channel)
     {
         this.channel = channel;
     }
 
+    @Override
     public byte getEncodedTrack()
     {
         return track;
     }
 
+    @Override
     public boolean isConnectionControl()
     {
         return false;
@@ -67,16 +71,19 @@ public final class ProtocolError implements NetworkEvent, ProtocolEvent
         return String.format(format, args);
     }
 
+    @Override
     public <C> void delegate(C context, ProtocolDelegate<C> delegate)
     {
         delegate.error(context, this);
     }
 
+    @Override
     public void delegate(NetworkDelegate delegate)
     {
         delegate.error(this);
     }
 
+    @Override
     public String toString()
     {
         return String.format("protocol error: %s", getMessage());

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/ProtocolHeader.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolHeader.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolHeader.java
index 421700f..9214f92 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolHeader.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolHeader.java
@@ -69,21 +69,25 @@ public final class ProtocolHeader implements NetworkEvent, ProtocolEvent
         return minor;
     }
 
+    @Override
     public int getChannel()
     {
         return channel;
     }
 
+    @Override
     public void setChannel(int channel)
     {
         this.channel = channel;
     }
 
+    @Override
     public byte getEncodedTrack()
     {
         return Frame.L1;
     }
 
+    @Override
     public boolean isConnectionControl()
     {
         return false;
@@ -101,16 +105,19 @@ public final class ProtocolHeader implements NetworkEvent, ProtocolEvent
         return buf;
     }
 
+    @Override
     public <C> void delegate(C context, ProtocolDelegate<C> delegate)
     {
         delegate.init(context, this);
     }
 
+    @Override
     public void delegate(NetworkDelegate delegate)
     {
         delegate.init(this);
     }
 
+    @Override
     public String toString()
     {
         return String.format("AMQP.%d %d-%d", instance, major, minor);

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/QueueDeclare.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
index 8cae122..6b8ea43 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
@@ -29,26 +29,32 @@ public final class QueueDeclare extends Method {
 
     public static final int TYPE = 2049;
 
+    @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;
@@ -90,6 +96,7 @@ public final class QueueDeclare extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.queueDeclare(context, this);
     }
@@ -312,6 +319,7 @@ public final class QueueDeclare extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -330,6 +338,7 @@ public final class QueueDeclare extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -348,6 +357,7 @@ public final class QueueDeclare 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/QueueDelete.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
index ee5ab43..ea45361 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
@@ -29,26 +29,32 @@ public final class QueueDelete extends Method {
 
     public static final int TYPE = 2050;
 
+    @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;
@@ -80,6 +86,7 @@ public final class QueueDelete extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.queueDelete(context, this);
     }
@@ -182,6 +189,7 @@ public final class QueueDelete extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -192,6 +200,7 @@ public final class QueueDelete extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -202,6 +211,7 @@ public final class QueueDelete 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/QueuePurge.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
index 1b6184d..3ea8bb9 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
@@ -29,26 +29,32 @@ public final class QueuePurge extends Method {
 
     public static final int TYPE = 2051;
 
+    @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;
@@ -78,6 +84,7 @@ public final class QueuePurge extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.queuePurge(context, this);
     }
@@ -112,6 +119,7 @@ public final class QueuePurge extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -122,6 +130,7 @@ public final class QueuePurge extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -132,6 +141,7 @@ public final class QueuePurge 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/QueueQuery.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
index 49ee417..a6eebac 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
@@ -29,26 +29,32 @@ public final class QueueQuery extends Method {
 
     public static final int TYPE = 2052;
 
+    @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;
@@ -78,6 +84,7 @@ public final class QueueQuery extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.queueQuery(context, this);
     }
@@ -112,6 +119,7 @@ public final class QueueQuery extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -122,6 +130,7 @@ public final class QueueQuery extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -132,6 +141,7 @@ public final class QueueQuery 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/QueueQueryResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
index d71dde3..3f250a4 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
@@ -29,14 +29,17 @@ public final class QueueQueryResult extends Struct {
 
     public static final int TYPE = 2049;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -328,6 +331,7 @@ public final class QueueQueryResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -354,6 +358,7 @@ public final class QueueQueryResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -380,6 +385,7 @@ public final class QueueQueryResult 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/Range.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
index 457f026..79af6cf 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
@@ -52,8 +52,10 @@ public abstract class Range implements RangeSet
 
     public abstract int getUpper();
 
+    @Override
     public abstract boolean includes(int value);
 
+    @Override
     public abstract boolean includes(Range range);
 
     public abstract boolean intersects(Range range);
@@ -81,51 +83,61 @@ public abstract class Range implements RangeSet
 
 
 
+    @Override
     public int size()
     {
         return 1;
     }
 
+    @Override
     public Iterator<Range> iterator()
     {
         return new RangeIterator();
     }
 
+    @Override
     public Range getFirst()
     {
         return this;
     }
 
+    @Override
     public Range getLast()
     {
         return this;
     }
 
+    @Override
     public void add(Range range)
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void add(int lower, int upper)
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void add(int value)
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void clear()
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void subtract(RangeSet rangeSet)
     {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public RangeSet copy()
     {
         RangeSet rangeSet = RangeSetFactory.createRangeSet();
@@ -142,32 +154,38 @@ public abstract class Range implements RangeSet
             this.point = point;
         }
 
+        @Override
         public int getLower()
         {
             return point;
         }
 
+        @Override
         public int getUpper()
         {
             return point;
         }
 
+        @Override
         public boolean includes(int value)
         {
             return value == point;
         }
 
 
+        @Override
         public boolean includes(Range range)
         {
             return range.getLower() == point && range.getUpper() == point;
         }
 
+        @Override
         public boolean intersects(Range range)
         {
             return range.includes(point);
         }
 
+        @Override
         public boolean touches(Range range)
         {
             return intersects(range) ||
@@ -175,11 +193,13 @@ public abstract class Range implements RangeSet
                     range.includes(point + 1) || range.includes(point - 1);
         }
 
+        @Override
         public Range span(Range range)
         {
             return newInstance(min(point, range.getLower()), max(point, range.getUpper()));
         }
 
+        @Override
         public List<Range> subtract(Range range)
         {
             if(range.includes(point))
@@ -192,6 +212,7 @@ public abstract class Range implements RangeSet
             }
         }
 
+        @Override
         public String toString()
         {
             return "[" + point + ", " + point + "]";
@@ -211,32 +232,38 @@ public abstract class Range implements RangeSet
             this.upper = upper;
         }
 
+        @Override
         public int getLower()
         {
             return lower;
         }
 
+        @Override
         public int getUpper()
         {
             return upper;
         }
 
+        @Override
         public boolean includes(int value)
         {
             return le(lower, value) && le(value, upper);
         }
 
+        @Override
         public boolean includes(Range range)
         {
             return includes(range.getLower()) && includes(range.getUpper());
         }
 
+        @Override
         public boolean intersects(Range range)
         {
             return (includes(range.getLower()) || includes(range.getUpper()) ||
                     range.includes(lower) || range.includes(upper));
         }
 
+        @Override
         public boolean touches(Range range)
         {
             return (intersects(range) ||
@@ -244,11 +271,13 @@ public abstract class Range implements RangeSet
                     range.includes(upper + 1) || range.includes(lower - 1));
         }
 
+        @Override
         public Range span(Range range)
         {
             return newInstance(min(lower, range.getLower()), max(upper, range.getUpper()));
         }
 
+        @Override
         public List<Range> subtract(Range range)
         {
             List<Range> result = new ArrayList<Range>();
@@ -272,6 +301,7 @@ public abstract class Range implements RangeSet
         }
 
 
+        @Override
         public String toString()
         {
             return "[" + lower + ", " + upper + "]";
@@ -283,11 +313,13 @@ public abstract class Range implements RangeSet
     {
         private boolean atFirst = true;
 
+        @Override
         public boolean hasNext()
         {
             return atFirst;
         }
 
+        @Override
         public Range next()
         {
 
@@ -297,6 +329,7 @@ public abstract class Range implements RangeSet
         }
 
 
+        @Override
         public void remove()
         {
             throw new UnsupportedOperationException();

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/RangeSet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java
index d0710c2..8ca2483 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java
@@ -32,6 +32,7 @@ public interface RangeSet extends Iterable<Range>
 
     int size();
 
+    @Override
     Iterator<Range> iterator();
 
     Range getFirst();

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/RangeSetImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
index 1721c99..f111be7 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
@@ -48,26 +48,31 @@ public class RangeSetImpl implements RangeSet
         ranges = new ArrayList<Range>(copy.ranges);
     }
 
+    @Override
     public int size()
     {
         return ranges.size();
     }
 
+    @Override
     public Iterator<Range> iterator()
     {
         return ranges.iterator();
     }
 
+    @Override
     public Range getFirst()
     {
         return ranges.get(0);
     }
 
+    @Override
     public Range getLast()
     {
         return ranges.get(ranges.size() - 1);
     }
 
+    @Override
     public boolean includes(Range range)
     {
         for (Range r : this)
@@ -81,6 +86,7 @@ public class RangeSetImpl implements RangeSet
         return false;
     }
 
+    @Override
     public boolean includes(int n)
     {
         for (Range r : this)
@@ -94,6 +100,7 @@ public class RangeSetImpl implements RangeSet
         return false;
     }
 
+    @Override
     public void add(Range range)
     {
         ListIterator<Range> it = ranges.listIterator();
@@ -117,6 +124,7 @@ public class RangeSetImpl implements RangeSet
         it.add(range);
     }
 
+    @Override
     public void add(int lower, int upper)
     {
         switch(ranges.size())
@@ -140,16 +148,19 @@ public class RangeSetImpl implements RangeSet
 
     }
 
+    @Override
     public void add(int value)
     {
         add(value, value);
     }
 
+    @Override
     public void clear()
     {
         ranges.clear();
     }
 
+    @Override
     public void subtract(final RangeSet other)
     {
         final Iterator<Range> otherIter = other.iterator() ;
@@ -212,11 +223,13 @@ public class RangeSetImpl implements RangeSet
         return (iter.hasNext() ? iter.next() : null) ;
     }
 
+    @Override
     public RangeSet copy()
     {
         return new RangeSetImpl(this);
     }
 
+    @Override
     public String toString()
     {
         StringBuffer str = new StringBuffer();

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/RecoverResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
index 67086c3..52dfe27 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
@@ -30,14 +30,17 @@ public final class RecoverResult extends Struct {
 
     public static final int TYPE = 1539;
 
+    @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 RecoverResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -111,6 +115,7 @@ public final class RecoverResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -121,6 +126,7 @@ public final class RecoverResult 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/ReplyTo.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
index cf00f8a..7547570 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
@@ -30,14 +30,17 @@ public final class ReplyTo extends Struct {
 
     public static final int TYPE = -3;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 2;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -131,6 +134,7 @@ public final class ReplyTo extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -164,6 +168,7 @@ public final class ReplyTo extends Struct {
     }
 
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -178,6 +183,7 @@ public final class ReplyTo extends Struct {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();
@@ -195,6 +201,7 @@ public final class ReplyTo extends Struct {
         return result;
     }
 
+    @Override
     public boolean equals(final Object obj){
         if (this == obj){
             return true;
@@ -209,6 +216,7 @@ public final class ReplyTo extends Struct {
             && (exchange == null ? reply.getExchange() == null : exchange.equals(reply.getExchange()));
     }
 
+    @Override
     public int hashCode(){
         int result = routingKey == null ? 1 : routingKey.hashCode();
         return 31 * result + (exchange == null ? 5 : exchange.hashCode());

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/SessionAttach.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
index 6d902f1..548f3f2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
@@ -30,26 +30,32 @@ public final class SessionAttach extends Method {
 
     public static final int TYPE = 513;
 
+    @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;
@@ -80,6 +86,7 @@ public final class SessionAttach extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionAttach(context, this);
     }
@@ -148,6 +155,7 @@ public final class SessionAttach extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -158,6 +166,7 @@ public final class SessionAttach extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -168,6 +177,7 @@ public final class SessionAttach 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/SessionAttached.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
index 0fad17d..abba557 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
@@ -30,26 +30,32 @@ public final class SessionAttached extends Method {
 
     public static final int TYPE = 514;
 
+    @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;
@@ -79,6 +85,7 @@ public final class SessionAttached extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionAttached(context, this);
     }
@@ -113,6 +120,7 @@ public final class SessionAttached extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class SessionAttached extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class SessionAttached 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/SessionCommandFragment.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
index ba6cb8c..59f83a3 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
@@ -30,14 +30,17 @@ public final class SessionCommandFragment extends Struct {
 
     public static final int TYPE = -2;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 0;
     }
 
+    @Override
     public final int getPackWidth() {
         return 0;
     }
@@ -106,6 +109,7 @@ public final class SessionCommandFragment extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeSequenceNo(this.commandId);
@@ -113,6 +117,7 @@ public final class SessionCommandFragment extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         this.commandId = dec.readSequenceNo();
@@ -120,6 +125,7 @@ public final class SessionCommandFragment 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/SessionCommandPoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
index 2000c61..5d2386d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
@@ -30,26 +30,32 @@ public final class SessionCommandPoint extends Method {
 
     public static final int TYPE = 519;
 
+    @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 SessionCommandPoint extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionCommandPoint(context, this);
     }
@@ -139,6 +146,7 @@ public final class SessionCommandPoint extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -153,6 +161,7 @@ public final class SessionCommandPoint extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -167,6 +176,7 @@ public final class SessionCommandPoint 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/SessionCompleted.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
index a2c1109..37a8ce1 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
@@ -30,26 +30,32 @@ public final class SessionCompleted extends Method {
 
     public static final int TYPE = 522;
 
+    @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;
@@ -80,6 +86,7 @@ public final class SessionCompleted extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionCompleted(context, this);
     }
@@ -148,6 +155,7 @@ public final class SessionCompleted extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -158,6 +166,7 @@ public final class SessionCompleted extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -168,6 +177,7 @@ public final class SessionCompleted 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/SessionConfirmed.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
index 7568244..a635379 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
@@ -30,26 +30,32 @@ public final class SessionConfirmed extends Method {
 
     public static final int TYPE = 521;
 
+    @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 SessionConfirmed extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionConfirmed(context, this);
     }
@@ -143,6 +150,7 @@ public final class SessionConfirmed extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class SessionConfirmed extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class SessionConfirmed 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/SessionDetach.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
index 9ae7b17..dc0d6f6 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
@@ -30,26 +30,32 @@ public final class SessionDetach extends Method {
 
     public static final int TYPE = 515;
 
+    @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;
@@ -79,6 +85,7 @@ public final class SessionDetach extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.sessionDetach(context, this);
     }
@@ -113,6 +120,7 @@ public final class SessionDetach extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class SessionDetach extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class SessionDetach extends Method {
 
     }
 
+    @Override
     public Map<String,Object> getFields()
     {
         Map<String,Object> result = new LinkedHashMap<String,Object>();


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