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:48 UTC

[07/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/ServerSessionDelegate.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 735ccb5..087d853 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -1814,11 +1814,13 @@ public class ServerSessionDelegate extends MethodDelegate<ServerSession> impleme
         closed(session);
     }
 
+    @Override
     public void init(ServerSession ssn, ProtocolHeader hdr)
     {
         LOGGER.warn("INIT: [{}] {}", ssn, hdr);
     }
 
+    @Override
     public void control(ServerSession ssn, Method method)
     {
         method.dispatch(ssn, this);
@@ -1834,11 +1836,13 @@ public class ServerSessionDelegate extends MethodDelegate<ServerSession> impleme
         }
     }
 
+    @Override
     public void error(ServerSession ssn, ProtocolError error)
     {
         LOGGER.warn("ERROR: [{}] {}", ssn, error);
     }
 
+    @Override
     public void handle(ServerSession ssn, Method method)
     {
         LOGGER.warn("UNHANDLED: [{}] {}", ssn, method);
@@ -1964,11 +1968,13 @@ public class ServerSessionDelegate extends MethodDelegate<ServerSession> impleme
             _method = xfr;
         }
 
+        @Override
         public void postCommit()
         {
             _serverSession.processed(_method);
         }
 
+        @Override
         public void onRollback()
         {
         }

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/Session_0_10.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
index 45a6500..581e4ea 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
@@ -173,6 +173,7 @@ public class Session_0_10 extends AbstractAMQPSession<Session_0_10, ConsumerTarg
         return _taskList;
     }
 
+    @Override
     public boolean isClosing()
     {
         return _serverSession.isClosing();

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/WindowCreditManager.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
index c04fe27..d5c09d4 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManager.java
@@ -60,6 +60,7 @@ public class WindowCreditManager implements FlowCreditManager_0_10
                     : _bytesUsed < _bytesCreditLimit ? _bytesCreditLimit - _bytesUsed : 0L;
     }
 
+    @Override
     public synchronized void restoreCredit(final long messageCredit, final long bytesCredit)
     {
         _messageUsed -= messageCredit;
@@ -77,12 +78,14 @@ public class WindowCreditManager implements FlowCreditManager_0_10
         }
     }
 
+    @Override
     public synchronized boolean hasCredit()
     {
         return (_bytesCreditLimit < 0L || _bytesCreditLimit > _bytesUsed)
                 && (_messageCreditLimit < 0L || _messageCreditLimit > _messageUsed);
     }
 
+    @Override
     public synchronized boolean useCreditForMessage(final long msgSize)
     {
         if(_messageCreditLimit >= 0L)
@@ -134,6 +137,7 @@ public class WindowCreditManager implements FlowCreditManager_0_10
     }
 
 
+    @Override
     public synchronized void addCredit(long count, long bytes)
     {
         if(bytes > 0)
@@ -156,6 +160,7 @@ public class WindowCreditManager implements FlowCreditManager_0_10
         }
     }
 
+    @Override
     public synchronized void clearCredit()
     {
         _bytesCreditLimit = 0l;

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/AbstractDecoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
index 92b04c5..5ff6fae 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
@@ -72,11 +72,13 @@ public abstract class AbstractDecoder implements Decoder
         return (short) (0xFF & get());
     }
 
+    @Override
     public short readUint8()
     {
         return uget();
     }
 
+    @Override
     public int readUint16()
     {
         int i = uget() << 8;
@@ -84,6 +86,7 @@ public abstract class AbstractDecoder implements Decoder
         return i;
     }
 
+    @Override
     public long readUint32()
     {
         long l = uget() << 24;
@@ -93,11 +96,13 @@ public abstract class AbstractDecoder implements Decoder
         return l;
     }
 
+    @Override
     public int readSequenceNo()
     {
         return (int) readUint32();
     }
 
+    @Override
     public long readUint64()
     {
         long l = 0;
@@ -108,11 +113,13 @@ public abstract class AbstractDecoder implements Decoder
         return l;
     }
 
+    @Override
     public long readDatetime()
     {
         return readUint64();
     }
 
+    @Override
     public String readStr8()
     {
         short size = readUint8();
@@ -134,6 +141,7 @@ public abstract class AbstractDecoder implements Decoder
         return str;
     }
 
+    @Override
     public String readStr16()
     {
         int size = readUint16();
@@ -142,6 +150,7 @@ public abstract class AbstractDecoder implements Decoder
         return new String(bytes, StandardCharsets.UTF_8);
     }
 
+    @Override
     public byte[] readVbin8()
     {
         int size = readUint8();
@@ -150,6 +159,7 @@ public abstract class AbstractDecoder implements Decoder
         return bytes;
     }
 
+    @Override
     public byte[] readVbin16()
     {
         int size = readUint16();
@@ -158,6 +168,7 @@ public abstract class AbstractDecoder implements Decoder
         return bytes;
     }
 
+    @Override
     public byte[] readVbin32()
     {
         int size = (int) readUint32();
@@ -166,6 +177,7 @@ public abstract class AbstractDecoder implements Decoder
         return bytes;
     }
 
+    @Override
     public RangeSet readSequenceSet()
     {
         int count = readUint16()/8;
@@ -185,11 +197,13 @@ public abstract class AbstractDecoder implements Decoder
         }
     }
 
+    @Override
     public RangeSet readByteRanges()
     {
         throw new Error("not implemented");
     }
 
+    @Override
     public UUID readUuid()
     {
         long msb = readUint64();
@@ -197,6 +211,7 @@ public abstract class AbstractDecoder implements Decoder
         return new UUID(msb, lsb);
     }
 
+    @Override
     public Struct readStruct(int type)
     {
         Struct st = Struct.create(type);
@@ -218,6 +233,7 @@ public abstract class AbstractDecoder implements Decoder
         return st;
     }
 
+    @Override
     public Struct readStruct32()
     {
         long size = readUint32();
@@ -234,6 +250,7 @@ public abstract class AbstractDecoder implements Decoder
         }
     }
 
+    @Override
     public Map<String,Object> readMap()
     {
         long size = readUint32();
@@ -263,6 +280,7 @@ public abstract class AbstractDecoder implements Decoder
         return result;
     }
 
+    @Override
     public List<Object> readList()
     {
         long size = readUint32();
@@ -290,6 +308,7 @@ public abstract class AbstractDecoder implements Decoder
         return result;
     }
 
+    @Override
     public List<Object> readArray()
     {
         long size = readUint32();

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/AbstractEncoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
index cf23cca..9eaff2d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
@@ -76,6 +76,7 @@ public abstract class AbstractEncoder implements Encoder
     protected abstract int beginSize32();
     protected abstract void endSize32(int pos);
 
+    @Override
     public void writeUint8(short b)
     {
         assert b < 0x100;
@@ -83,6 +84,7 @@ public abstract class AbstractEncoder implements Encoder
         put((byte) b);
     }
 
+    @Override
     public void writeUint16(int s)
     {
         assert s < 0x10000;
@@ -91,6 +93,7 @@ public abstract class AbstractEncoder implements Encoder
         put(lsb(s));
     }
 
+    @Override
     public void writeUint32(long i)
     {
         assert i < 0x100000000L;
@@ -101,11 +104,13 @@ public abstract class AbstractEncoder implements Encoder
         put(lsb(i));
     }
 
+    @Override
     public void writeSequenceNo(int i)
     {
         writeUint32(i);
     }
 
+    @Override
     public void writeUint64(long l)
     {
         for (int i = 0; i < 8; i++)
@@ -115,11 +120,13 @@ public abstract class AbstractEncoder implements Encoder
     }
 
 
+    @Override
     public void writeDatetime(long l)
     {
         writeUint64(l);
     }
 
+    @Override
     public void writeStr8(String s)
     {
         if (s == null)
@@ -141,6 +148,7 @@ public abstract class AbstractEncoder implements Encoder
         put(bytes);
     }
 
+    @Override
     public void writeStr16(String s)
     {
         if (s == null)
@@ -158,6 +166,7 @@ public abstract class AbstractEncoder implements Encoder
         put(bytes);
     }
 
+    @Override
     public void writeVbin8(byte[] bytes)
     {
         if (bytes == null) { bytes = new byte[0]; }
@@ -169,6 +178,7 @@ public abstract class AbstractEncoder implements Encoder
         put(ByteBuffer.wrap(bytes));
     }
 
+    @Override
     public void writeVbin16(byte[] bytes)
     {
         if (bytes == null) { bytes = new byte[0]; }
@@ -176,6 +186,7 @@ public abstract class AbstractEncoder implements Encoder
         put(ByteBuffer.wrap(bytes));
     }
 
+    @Override
     public void writeVbin32(byte[] bytes)
     {
         if (bytes == null) { bytes = new byte[0]; }
@@ -183,6 +194,7 @@ public abstract class AbstractEncoder implements Encoder
         put(ByteBuffer.wrap(bytes));
     }
 
+    @Override
     public void writeSequenceSet(RangeSet ranges)
     {
         if (ranges == null)
@@ -200,11 +212,13 @@ public abstract class AbstractEncoder implements Encoder
         }
     }
 
+    @Override
     public void writeByteRanges(RangeSet ranges)
     {
         throw new Error("not implemented");
     }
 
+    @Override
     public void writeUuid(UUID uuid)
     {
         long msb = 0;
@@ -218,6 +232,7 @@ public abstract class AbstractEncoder implements Encoder
         writeUint64(lsb);
     }
 
+    @Override
     public void writeStruct(int type, Struct s)
     {
         boolean empty = false;
@@ -247,6 +262,7 @@ public abstract class AbstractEncoder implements Encoder
         }
     }
 
+    @Override
     public void writeStruct32(Struct s)
     {
         if (s == null)
@@ -262,6 +278,7 @@ public abstract class AbstractEncoder implements Encoder
         }
     }
 
+    @Override
     public void writeMap(Map<String,Object> map)
     {
         int pos = beginSize32();
@@ -286,6 +303,7 @@ public abstract class AbstractEncoder implements Encoder
         }
     }
 
+    @Override
     public void writeList(List<Object> list)
     {
         int pos = beginSize32();
@@ -307,6 +325,7 @@ public abstract class AbstractEncoder implements Encoder
         }
     }
 
+    @Override
     public void writeArray(List<Object> array)
     {
         int pos = beginSize32();

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/Acquired.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
index b8693d4..fcae54d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
@@ -30,14 +30,17 @@ public final class Acquired extends Struct {
 
     public static final int TYPE = 1028;
 
+    @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 Acquired extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -111,6 +115,7 @@ public final class Acquired extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -121,6 +126,7 @@ public final class Acquired 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/BBDecoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoder.java
index 5ca7d14..2e54890 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoder.java
@@ -44,16 +44,19 @@ public final class BBDecoder extends AbstractDecoder
         in = null;
     }
 
+    @Override
     protected byte doGet()
     {
         return in.get();
     }
 
+    @Override
     protected void doGet(byte[] bytes)
     {
         in.get(bytes);
     }
 
+    @Override
     protected Binary get(int size)
     {
         if (in.hasArray())
@@ -69,79 +72,93 @@ public final class BBDecoder extends AbstractDecoder
         }
     }
 
+    @Override
     public boolean hasRemaining()
     {
         return in.hasRemaining();
     }
 
+    @Override
     public short readUint8()
     {
         return (short) (0xFF & in.get());
     }
 
+    @Override
     public int readUint16()
     {
         return 0xFFFF & in.getShort();
     }
 
+    @Override
     public long readUint32()
     {
         return 0xFFFFFFFFL & in.getInt();
     }
 
+    @Override
     public long readUint64()
     {
         return in.getLong();
     }
 
-	public byte[] readBin128()
+	@Override
+    public byte[] readBin128()
 	{
 		byte[] result = new byte[16];
 		get(result);
 		return result;
 	}
 	
-	public byte[] readBytes(int howManyBytes)
+	@Override
+    public byte[] readBytes(int howManyBytes)
 	{
 		byte[] result = new byte[howManyBytes];
 		get(result);
 		return result;
 	}
 	
-	public double readDouble()
+	@Override
+    public double readDouble()
 	{
 		return in.getDouble();
 	}
 
-	public float readFloat()
+	@Override
+    public float readFloat()
 	{
 		return in.getFloat();
 	}
 
-	public short readInt16()
+	@Override
+    public short readInt16()
 	{
 		return in.getShort();
 	}
 
-	public int readInt32()
+	@Override
+    public int readInt32()
 	{
 		return in.getInt();
 	}
 
-	public byte readInt8()
+	@Override
+    public byte readInt8()
 	{
 		return in.get();
 	}
 
-	public byte[] readRemainingBytes()
+	@Override
+    public byte[] readRemainingBytes()
 	{
-      byte[] result = new byte[in.limit() - in.position()];
-      get(result);
-      return result;		
+        byte[] result = new byte[in.limit() - in.position()];
+        get(result);
+        return result;
 	}
 
-	public long readInt64()
+	@Override
+    public long readInt64()
 	{
 		return in.getLong();
 	}
-}
\ No newline at end of file
+}

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/BBEncoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoder.java
index a4aa1b2..f290a93 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoder.java
@@ -43,6 +43,7 @@ public final class BBEncoder extends AbstractEncoder
         segment = 0;
     }
 
+    @Override
     public void init()
     {
         out.clear();
@@ -70,6 +71,7 @@ public final class BBEncoder extends AbstractEncoder
         return slice;
     }
 
+    @Override
     public int position()
     {
         return out.position();
@@ -90,6 +92,7 @@ public final class BBEncoder extends AbstractEncoder
         out.put(old);
     }
 
+    @Override
     protected void doPut(byte b)
     {
         try
@@ -103,6 +106,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     protected void doPut(ByteBuffer src)
     {
         try
@@ -116,6 +120,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     protected void put(byte[] bytes)
     {
         try
@@ -129,6 +134,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     public void writeUint8(short b)
     {
         assert b < 0x100;
@@ -144,6 +150,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     public void writeUint16(int s)
     {
         assert s < 0x10000;
@@ -159,6 +166,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     public void writeUint32(long i)
     {
         assert i < 0x100000000L;
@@ -174,6 +182,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     public void writeUint64(long l)
     {
         try
@@ -187,6 +196,7 @@ public final class BBEncoder extends AbstractEncoder
         }
     }
 
+    @Override
     public int beginSize8()
     {
         int pos = out.position();
@@ -202,12 +212,14 @@ public final class BBEncoder extends AbstractEncoder
         return pos;
     }
 
+    @Override
     public void endSize8(int pos)
     {
         int cur = out.position();
         out.put(pos, (byte) (cur - pos - 1));
     }
 
+    @Override
     public int beginSize16()
     {
         int pos = out.position();
@@ -223,12 +235,14 @@ public final class BBEncoder extends AbstractEncoder
         return pos;
     }
 
+    @Override
     public void endSize16(int pos)
     {
         int cur = out.position();
         out.putShort(pos, (short) (cur - pos - 2));
     }
 
+    @Override
     public int beginSize32()
     {
         int pos = out.position();
@@ -244,13 +258,15 @@ public final class BBEncoder extends AbstractEncoder
         return pos;
     }
 
+    @Override
     public void endSize32(int pos)
     {
         int cur = out.position();
         out.putInt(pos, (cur - pos - 4));
     }
 
-	public void writeDouble(double aDouble)
+	@Override
+    public void writeDouble(double aDouble)
 	{
 		try 
 		{
@@ -262,7 +278,8 @@ public final class BBEncoder extends AbstractEncoder
 		}
 	}
 
-	public void writeInt16(short aShort)
+	@Override
+    public void writeInt16(short aShort)
 	{
 		try 
 		{
@@ -274,7 +291,8 @@ public final class BBEncoder extends AbstractEncoder
 		}
 	}
 
-	public void writeInt32(int anInt)
+	@Override
+    public void writeInt32(int anInt)
 	{
 		try
 		{
@@ -286,7 +304,8 @@ public final class BBEncoder extends AbstractEncoder
 		}
 	}
 
-	public void writeInt64(long aLong)
+	@Override
+    public void writeInt64(long aLong)
 	{
 		try
 		{
@@ -298,7 +317,8 @@ public final class BBEncoder extends AbstractEncoder
 		}
 	}
       
-	public void writeInt8(byte aByte)
+	@Override
+    public void writeInt8(byte aByte)
 	{
 		try 
 		{
@@ -310,7 +330,8 @@ public final class BBEncoder extends AbstractEncoder
 		}
 	}	
 	
-	public void writeBin128(byte[] byteArray)
+	@Override
+    public void writeBin128(byte[] byteArray)
 	{
 		byteArray = (byteArray != null) ? byteArray : new byte [16];
 		
@@ -348,7 +369,8 @@ public final class BBEncoder extends AbstractEncoder
         writeBin128(data);
     }
 
-	public void writeFloat(float aFloat)
+	@Override
+    public void writeFloat(float aFloat)
 	{
 		try 
 		{

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/Binary.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Binary.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Binary.java
index a5239f3..75998c0 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Binary.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Binary.java
@@ -98,6 +98,7 @@ public final class Binary
         return new Binary(bytes, offset + low, sz);
     }
 
+    @Override
     public final int hashCode()
     {
         if (hash == 0)
@@ -113,6 +114,7 @@ public final class Binary
         return hash;
     }
 
+    @Override
     public final boolean equals(Object o)
     {
         if (!(o instanceof Binary))
@@ -137,6 +139,7 @@ public final class Binary
         return true;
     }
 
+    @Override
     public String toString()
     {
         return str(ByteBuffer.wrap(bytes, offset, size));

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/ConnectionClose.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
index 3daccea..f272e2f 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
@@ -30,26 +30,32 @@ public final class ConnectionClose extends Method {
 
     public static final int TYPE = 267;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -83,6 +89,7 @@ public final class ConnectionClose extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionClose(context, this);
     }
@@ -143,6 +150,7 @@ public final class ConnectionClose extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class ConnectionClose extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class ConnectionClose 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/ConnectionCloseOk.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
index 45961cc..f9dcc7f 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
@@ -30,26 +30,32 @@ public final class ConnectionCloseOk extends Method {
 
     public static final int TYPE = 268;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -74,6 +80,7 @@ public final class ConnectionCloseOk extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionCloseOk(context, this);
     }
@@ -82,18 +89,21 @@ public final class ConnectionCloseOk 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/ConnectionHeartbeat.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
index d8721f5..dee78a1 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
@@ -30,26 +30,32 @@ public final class ConnectionHeartbeat extends Method {
 
     public static final int TYPE = 266;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -74,6 +80,7 @@ public final class ConnectionHeartbeat extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionHeartbeat(context, this);
     }
@@ -82,18 +89,21 @@ public final class ConnectionHeartbeat 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/ConnectionOpen.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
index bbec784..ff195b2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
@@ -30,26 +30,32 @@ public final class ConnectionOpen extends Method {
 
     public static final int TYPE = 263;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -84,6 +90,7 @@ public final class ConnectionOpen extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionOpen(context, this);
     }
@@ -178,6 +185,7 @@ public final class ConnectionOpen extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -192,6 +200,7 @@ public final class ConnectionOpen extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -206,6 +215,7 @@ public final class ConnectionOpen 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/ConnectionOpenOk.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
index 5c8f796..9d7e1eb 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
@@ -30,26 +30,32 @@ public final class ConnectionOpenOk extends Method {
 
     public static final int TYPE = 264;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -79,6 +85,7 @@ public final class ConnectionOpenOk extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionOpenOk(context, this);
     }
@@ -113,6 +120,7 @@ public final class ConnectionOpenOk extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class ConnectionOpenOk extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class ConnectionOpenOk 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/ConnectionRedirect.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
index 5b78317..90d3af2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
@@ -30,26 +30,32 @@ public final class ConnectionRedirect extends Method {
 
     public static final int TYPE = 265;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -83,6 +89,7 @@ public final class ConnectionRedirect extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionRedirect(context, this);
     }
@@ -143,6 +150,7 @@ public final class ConnectionRedirect extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class ConnectionRedirect extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class ConnectionRedirect 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/ConnectionSecure.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
index 78fd33a..2d4fd34 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
@@ -30,26 +30,32 @@ public final class ConnectionSecure extends Method {
 
     public static final int TYPE = 259;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -79,6 +85,7 @@ public final class ConnectionSecure extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionSecure(context, this);
     }
@@ -113,6 +120,7 @@ public final class ConnectionSecure extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class ConnectionSecure extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class ConnectionSecure 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/ConnectionSecureOk.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
index c3acca1..42757af 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
@@ -30,26 +30,32 @@ public final class ConnectionSecureOk extends Method {
 
     public static final int TYPE = 260;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -79,6 +85,7 @@ public final class ConnectionSecureOk extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionSecureOk(context, this);
     }
@@ -113,6 +120,7 @@ public final class ConnectionSecureOk extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class ConnectionSecureOk extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class ConnectionSecureOk 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/ConnectionStart.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
index 4e1952e..bb30254 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
@@ -30,26 +30,32 @@ public final class ConnectionStart extends Method {
 
     public static final int TYPE = 257;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -87,6 +93,7 @@ public final class ConnectionStart extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionStart(context, this);
     }
@@ -173,6 +180,7 @@ public final class ConnectionStart extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -191,6 +199,7 @@ public final class ConnectionStart extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -209,6 +218,7 @@ public final class ConnectionStart 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/ConnectionStartOk.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
index 1742f69..361ac7e 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
@@ -30,26 +30,32 @@ public final class ConnectionStartOk extends Method {
 
     public static final int TYPE = 258;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -91,6 +97,7 @@ public final class ConnectionStartOk extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionStartOk(context, this);
     }
@@ -203,6 +210,7 @@ public final class ConnectionStartOk extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -225,6 +233,7 @@ public final class ConnectionStartOk extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -247,6 +256,7 @@ public final class ConnectionStartOk 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/ConnectionTune.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
index 8cc4afd..c6caf25 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
@@ -30,26 +30,32 @@ public final class ConnectionTune extends Method {
 
     public static final int TYPE = 261;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -83,6 +89,7 @@ public final class ConnectionTune extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionTune(context, this);
     }
@@ -195,6 +202,7 @@ public final class ConnectionTune extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -217,6 +225,7 @@ public final class ConnectionTune extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -239,6 +248,7 @@ public final class ConnectionTune 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/ConnectionTuneOk.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
index a2d6d56..a61d92b 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
@@ -30,26 +30,32 @@ public final class ConnectionTuneOk extends Method {
 
     public static final int TYPE = 262;
 
+    @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.L1;
     }
 
+    @Override
     public final boolean isConnectionControl()
     {
         return true;
@@ -81,6 +87,7 @@ public final class ConnectionTuneOk extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.connectionTuneOk(context, this);
     }
@@ -167,6 +174,7 @@ public final class ConnectionTuneOk extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -185,6 +193,7 @@ public final class ConnectionTuneOk extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -203,6 +212,7 @@ public final class ConnectionTuneOk 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/DeliveryProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
index 126c810..166d58d 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
@@ -32,14 +32,17 @@ public final class DeliveryProperties extends Struct {
 
     public static final int TYPE = 1025;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -475,6 +478,7 @@ public final class DeliveryProperties extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -517,6 +521,7 @@ public final class DeliveryProperties extends Struct {
 
     }
 
+    @Override
     public int getEncodedLength()
     {
         int len = 0;
@@ -562,6 +567,7 @@ public final class DeliveryProperties extends Struct {
         return len;
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -605,6 +611,7 @@ public final class DeliveryProperties 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/DtxCommit.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
index b4acc57..dae7fd5 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
@@ -30,26 +30,32 @@ public final class DtxCommit extends Method {
 
     public static final int TYPE = 1540;
 
+    @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 DtxCommit extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxCommit(context, this);
     }
@@ -148,6 +155,7 @@ public final class DtxCommit extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -158,6 +166,7 @@ public final class DtxCommit extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -168,6 +177,7 @@ public final class DtxCommit 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/DtxEnd.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
index 9456e0e..1b7268c 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
@@ -30,26 +30,32 @@ public final class DtxEnd extends Method {
 
     public static final int TYPE = 1539;
 
+    @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 DtxEnd extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxEnd(context, this);
     }
@@ -183,6 +190,7 @@ public final class DtxEnd extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -193,6 +201,7 @@ public final class DtxEnd extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -203,6 +212,7 @@ public final class DtxEnd 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/DtxForget.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
index 41aeb21..342b351 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
@@ -30,26 +30,32 @@ public final class DtxForget extends Method {
 
     public static final int TYPE = 1541;
 
+    @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 DtxForget extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxForget(context, this);
     }
@@ -113,6 +120,7 @@ public final class DtxForget extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class DtxForget extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class DtxForget 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/DtxGetTimeout.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
index febd41a..92f0187 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
@@ -30,26 +30,32 @@ public final class DtxGetTimeout extends Method {
 
     public static final int TYPE = 1542;
 
+    @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 DtxGetTimeout extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxGetTimeout(context, this);
     }
@@ -113,6 +120,7 @@ public final class DtxGetTimeout extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class DtxGetTimeout extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class DtxGetTimeout 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/DtxPrepare.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
index cd38e13..e906744 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
@@ -30,26 +30,32 @@ public final class DtxPrepare extends Method {
 
     public static final int TYPE = 1543;
 
+    @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 DtxPrepare extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxPrepare(context, this);
     }
@@ -113,6 +120,7 @@ public final class DtxPrepare extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class DtxPrepare extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class DtxPrepare 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/DtxRecover.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
index 65e4e08..3e32abd 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
@@ -30,26 +30,32 @@ public final class DtxRecover extends Method {
 
     public static final int TYPE = 1544;
 
+    @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 DtxRecover extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxRecover(context, this);
     }
@@ -82,18 +89,21 @@ public final class DtxRecover 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/DtxRollback.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
index a2837a0..09e6a1e 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
@@ -30,26 +30,32 @@ public final class DtxRollback extends Method {
 
     public static final int TYPE = 1545;
 
+    @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 DtxRollback extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxRollback(context, this);
     }
@@ -113,6 +120,7 @@ public final class DtxRollback extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class DtxRollback extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class DtxRollback 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/DtxSelect.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
index 629064f..1bff340 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
@@ -30,26 +30,32 @@ public final class DtxSelect extends Method {
 
     public static final int TYPE = 1537;
 
+    @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 DtxSelect extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxSelect(context, this);
     }
@@ -82,18 +89,21 @@ public final class DtxSelect 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/DtxSetTimeout.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
index effc86e..e791779 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
@@ -30,26 +30,32 @@ public final class DtxSetTimeout extends Method {
 
     public static final int TYPE = 1546;
 
+    @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 DtxSetTimeout extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxSetTimeout(context, this);
     }
@@ -141,6 +148,7 @@ public final class DtxSetTimeout extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -155,6 +163,7 @@ public final class DtxSetTimeout extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -169,6 +178,7 @@ public final class DtxSetTimeout 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/DtxStart.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
index bb8c2ef..ffa9c38 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
@@ -30,26 +30,32 @@ public final class DtxStart extends Method {
 
     public static final int TYPE = 1538;
 
+    @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 DtxStart extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.dtxStart(context, this);
     }
@@ -183,6 +190,7 @@ public final class DtxStart extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -193,6 +201,7 @@ public final class DtxStart extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -203,6 +212,7 @@ public final class DtxStart 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/ExchangeBind.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
index d7cef45..c40be73 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
@@ -30,26 +30,32 @@ public final class ExchangeBind extends Method {
 
     public static final int TYPE = 1796;
 
+    @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;
@@ -91,6 +97,7 @@ public final class ExchangeBind extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeBind(context, this);
     }
@@ -203,6 +210,7 @@ public final class ExchangeBind extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -225,6 +233,7 @@ public final class ExchangeBind extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -247,6 +256,7 @@ public final class ExchangeBind 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/ExchangeBound.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
index 380d2c6..d4b885e 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
@@ -30,26 +30,32 @@ public final class ExchangeBound extends Method {
 
     public static final int TYPE = 1798;
 
+    @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;
@@ -91,6 +97,7 @@ public final class ExchangeBound extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeBound(context, this);
     }
@@ -203,6 +210,7 @@ public final class ExchangeBound extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -225,6 +233,7 @@ public final class ExchangeBound extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -247,6 +256,7 @@ public final class ExchangeBound 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/ExchangeBoundResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
index f0de00c..a2cc0f0 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
@@ -30,14 +30,17 @@ public final class ExchangeBoundResult extends Struct {
 
     public static final int TYPE = 1794;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -253,18 +256,21 @@ public final class ExchangeBoundResult extends Struct {
 
 
 
+    @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/ExchangeDeclare.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
index 03ff4cb..3f66ff9 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
@@ -30,26 +30,32 @@ public final class ExchangeDeclare extends Method {
 
     public static final int TYPE = 1793;
 
+    @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;
@@ -94,6 +100,7 @@ public final class ExchangeDeclare extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeDeclare(context, this);
     }
@@ -308,6 +315,7 @@ public final class ExchangeDeclare extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -330,6 +338,7 @@ public final class ExchangeDeclare extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -352,6 +361,7 @@ public final class ExchangeDeclare 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/ExchangeDelete.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
index 507c05a..6faa954 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
@@ -30,26 +30,32 @@ public final class ExchangeDelete extends Method {
 
     public static final int TYPE = 1794;
 
+    @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 ExchangeDelete extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeDelete(context, this);
     }
@@ -148,6 +155,7 @@ public final class ExchangeDelete extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -158,6 +166,7 @@ public final class ExchangeDelete extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -168,6 +177,7 @@ public final class ExchangeDelete 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/ExchangeQuery.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
index 03691ec..2eed787 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
@@ -30,26 +30,32 @@ public final class ExchangeQuery extends Method {
 
     public static final int TYPE = 1795;
 
+    @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 ExchangeQuery extends Method {
 
     }
 
+    @Override
     public <C> void dispatch(C context, MethodDelegate<C> delegate) {
         delegate.exchangeQuery(context, this);
     }
@@ -113,6 +120,7 @@ public final class ExchangeQuery extends Method {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -123,6 +131,7 @@ public final class ExchangeQuery extends Method {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -133,6 +142,7 @@ public final class ExchangeQuery 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/ExchangeQueryResult.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
index c5be1b2..92e5570 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
@@ -30,14 +30,17 @@ public final class ExchangeQueryResult extends Struct {
 
     public static final int TYPE = 1793;
 
+    @Override
     public final int getStructType() {
         return TYPE;
     }
 
+    @Override
     public final int getSizeWidth() {
         return 4;
     }
 
+    @Override
     public final int getPackWidth() {
         return 2;
     }
@@ -208,6 +211,7 @@ public final class ExchangeQueryResult extends Struct {
 
 
 
+    @Override
     public void write(Encoder enc)
     {
         enc.writeUint16(packing_flags);
@@ -222,6 +226,7 @@ public final class ExchangeQueryResult extends Struct {
 
     }
 
+    @Override
     public void read(Decoder dec)
     {
         packing_flags = (short) dec.readUint16();
@@ -236,6 +241,7 @@ public final class ExchangeQueryResult extends Struct {
 
     }
 
+    @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