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

[03/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-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
index 1d6258e..5ff04f2 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
@@ -42,31 +42,37 @@ public class TxSelectOkBody extends AMQMethodBodyImpl implements EncodableAMQDat
     {
     }
 
+    @Override
     public int getClazz()
     {
         return CLASS_ID;
     }
 
+    @Override
     public int getMethod()
     {
         return METHOD_ID;
     }
 
 
+    @Override
     protected int getBodySize()
     {
         return 0;
     }
 
+    @Override
     public void writeMethodPayload(QpidByteBuffer buffer)
     {
     }
 
+    @Override
     public boolean execute(MethodDispatcher dispatcher, int channelId) throws QpidException
 	{
         return dispatcher.dispatchTxSelectOk(this, channelId);
 	}
 
+    @Override
     public String toString()
     {
         return "[TxSelectOkBody]";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
index 3a9dcd5..df8df42 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
@@ -94,5 +94,6 @@ public interface BindingURL
 
     String[] getBindingKeys();
 
+    @Override
     String toString();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
index 0b55cd2..6fbc2eb 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
@@ -54,6 +54,7 @@ public class URLSyntaxException extends URISyntaxException
     }
 
 
+    @Override
     public String toString()
     {
         StringBuffer sb = new StringBuffer();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
index 51d789f..c96ee58 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
@@ -51,6 +51,7 @@ public class AMQDecoderTest extends QpidTestCase
     private FrameCreatingMethodProcessor _methodProcessor;
 
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index 68fc9e9..33140f0 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
@@ -44,6 +44,7 @@ public class ReferenceCountingTest extends QpidTestCase
     private TestMemoryMessageStore _store;
 
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
index 14ba3a3..32e6238 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
@@ -42,6 +42,7 @@ public class BasicContentHeaderPropertiesTest extends QpidTestCase
         _testProperties = new BasicContentHeaderProperties();
     }
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
index fd2906e..fa14fc1 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
@@ -29,6 +29,7 @@ public class MessagePublishInfoImplTest extends QpidTestCase
     private final AMQShortString _exchange = new AMQShortString("exchange");
     private final AMQShortString _routingKey = new AMQShortString("routingKey");
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java
index 0b78622..d7af093 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java
@@ -315,6 +315,7 @@ public abstract class AbstractReceivingLinkEndpoint<T extends BaseTarget> extend
         }
     }
 
+    @Override
     public void flowStateChanged()
     {
     }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
index 3942ca8..af25173 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
@@ -132,6 +132,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
 
     }
 
+    @Override
     public void doSend(final MessageInstanceConsumer consumer, final MessageInstance entry, boolean batch)
     {
         ServerMessage serverMessage = entry.getMessage();
@@ -301,6 +302,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
         }
     }
 
+    @Override
     public void flushBatched()
     {
         // TODO
@@ -322,6 +324,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
         linkReg.unregisterSendingLink(getEndpoint().getName());
     }
       */
+    @Override
     public boolean allocateCredit(final ServerMessage msg)
     {
         ProtocolEngine protocolEngine = getSession().getConnection();
@@ -338,12 +341,14 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
     }
 
 
+    @Override
     public void restoreCredit(final ServerMessage message)
     {
         _linkEndpoint.setLinkCredit(_linkEndpoint.getLinkCredit().add(UnsignedInteger.ONE));
         updateNotifyWorkDesired();
     }
 
+    @Override
     public void queueEmpty()
     {
         if(_linkEndpoint.drained())
@@ -392,6 +397,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
             return _consumer;
         }
 
+        @Override
         public boolean process(DeliveryState state, final Boolean settled)
         {
 
@@ -641,6 +647,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
         {
         }
 
+        @Override
         public boolean process(final DeliveryState state, final Boolean settled)
         {
             return true;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
index c26dbab..edffe0d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
@@ -91,11 +91,13 @@ public class ExchangeDestination extends QueueDestination
         _capabilities = destinationCapabilities.toArray(new Symbol[destinationCapabilities.size()]);
     }
 
+    @Override
     public Outcome[] getOutcomes()
     {
         return OUTCOMES;
     }
 
+    @Override
     public Outcome send(final ServerMessage<?> message, final ServerTransaction txn, final SecurityToken securityToken)
     {
         final String routingAddress = getRoutingAddress(message);
@@ -209,6 +211,7 @@ public class ExchangeDestination extends QueueDestination
         return _expiryPolicy;
     }
 
+    @Override
     public int getCredit()
     {
         // TODO - fix

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
index 57fca30..2ac734a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
@@ -49,6 +49,7 @@ public class MessageConverter_Internal_to_v1_0 extends MessageConverter_to_1_0<I
 {
 
 
+    @Override
     public Class<InternalMessage> getInputClass()
     {
         return InternalMessage.class;
@@ -101,6 +102,7 @@ public class MessageConverter_Internal_to_v1_0 extends MessageConverter_to_1_0<I
 
     }
 
+    @Override
     protected EncodingRetainingSection<?> getBodySection(final InternalMessage serverMessage,
                                                          final SectionEncoder encoder)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index b3e544d..7dc1401 100755
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
@@ -187,12 +187,14 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
     }
 
 
+    @Override
     public MessageMetaDataType getType()
     {
         return TYPE;
     }
 
 
+    @Override
     public int getStorableSize()
     {
 
@@ -225,6 +227,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
         return (int) size;
     }
 
+    @Override
     public void writeToBuffer(QpidByteBuffer dest)
     {
         dest.put(VERSION_BYTE);
@@ -256,11 +259,13 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
         }
     }
 
+    @Override
     public int getContentSize()
     {
         return (int) _contentSize;
     }
 
+    @Override
     public boolean isPersistent()
     {
         return _headerSection != null && Boolean.TRUE.equals(_headerSection.getValue().getDurable());
@@ -411,6 +416,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             _typeRegistry.registerSecurityLayer();
         }
 
+        @Override
         public MessageMetaData_1_0 createMetaData(List<QpidByteBuffer> bufs)
         {
             try
@@ -486,6 +492,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
 
         private final AtomicReference<String> _decodedUserId = new AtomicReference<>();
 
+        @Override
         public String getCorrelationId()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getCorrelationId() == null)
@@ -516,6 +523,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public String getMessageId()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getMessageId() == null)
@@ -528,6 +536,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public String getMimeType()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getContentType() == null)
@@ -540,6 +549,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public String getEncoding()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getContentEncoding() == null)
@@ -552,6 +562,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public byte getPriority()
         {
             if (_headerSection == null || _headerSection.getValue().getPriority() == null)
@@ -564,6 +575,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public long getTimestamp()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getCreationTime() == null)
@@ -600,6 +612,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             return notValidBefore;
         }
 
+        @Override
         public String getType()
         {
             String subject = getSubject();
@@ -619,6 +632,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public String getReplyTo()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getReplyTo() == null)
@@ -631,12 +645,14 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public String getAppId()
         {
             //TODO
             return null;
         }
 
+        @Override
         public String getUserId()
         {
             if (_propertiesSection == null || _propertiesSection.getValue().getUserId() == null)
@@ -656,11 +672,13 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             }
         }
 
+        @Override
         public Object getHeader(final String name)
         {
             return _applicationPropertiesSection == null ? null : _applicationPropertiesSection.getValue().get(name);
         }
 
+        @Override
         public boolean containsHeaders(final Set<String> names)
         {
             if (_applicationPropertiesSection == null)
@@ -688,6 +706,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             return Collections.unmodifiableCollection(_applicationPropertiesSection.getValue().keySet());
         }
 
+        @Override
         public boolean containsHeader(final String name)
         {
             return _applicationPropertiesSection != null && _applicationPropertiesSection.getValue().containsKey(name);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
index 1e61657..2cd18ab 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
@@ -70,6 +70,7 @@ public class Message_1_0 extends AbstractServerMessageImpl<Message_1_0, MessageM
         super(storedMessage, connectionReference);
     }
 
+    @Override
     public String getInitialRoutingAddress()
     {
         MessageMetaData_1_0.MessageHeader_1_0 messageHeader = getMessageHeader();
@@ -105,6 +106,7 @@ public class Message_1_0 extends AbstractServerMessageImpl<Message_1_0, MessageM
         return metaData == null ? DELETED_MESSAGE_METADATA : metaData;
     }
 
+    @Override
     public MessageMetaData_1_0.MessageHeader_1_0 getMessageHeader()
     {
         return getMessageMetaData().getMessageHeader();
@@ -122,6 +124,7 @@ public class Message_1_0 extends AbstractServerMessageImpl<Message_1_0, MessageM
         return AMQP_1_0;
     }
 
+    @Override
     public long getArrivalTime()
     {
         return getMessageMetaData().getArrivalTime();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
index 1332a95..f254613 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
@@ -74,11 +74,13 @@ public class NodeReceivingDestination implements ReceivingDestination
 
     }
 
+    @Override
     public Outcome[] getOutcomes()
     {
         return OUTCOMES;
     }
 
+    @Override
     public Outcome send(final ServerMessage<?> message, final ServerTransaction txn, final SecurityToken securityToken)
     {
         final String routingAddress = ReceivingDestination.getRoutingAddress(message, _address);
@@ -175,6 +177,7 @@ public class NodeReceivingDestination implements ReceivingDestination
         return _expiryPolicy;
     }
 
+    @Override
     public int getCredit()
     {
         // TODO - fix

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java
index 24ecac5..784d735 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java
@@ -59,17 +59,20 @@ public class ProtocolEngineCreator_1_0_0 implements ProtocolEngineCreator
     {
     }
 
+    @Override
     public Protocol getVersion()
     {
         return Protocol.AMQP_1_0;
     }
 
 
+    @Override
     public byte[] getHeaderIdentifier()
     {
         return AMQP_1_0_0_HEADER;
     }
 
+    @Override
     public ProtocolEngine newProtocolEngine(Broker<?> broker,
                                             ServerNetworkConnection network,
                                             AmqpPort<?> port,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
index 221f073..dc6ceee 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
@@ -48,17 +48,20 @@ public class ProtocolEngineCreator_1_0_0_SASL implements ProtocolEngineCreator
     {
     }
 
+    @Override
     public Protocol getVersion()
     {
         return Protocol.AMQP_1_0;
     }
 
 
+    @Override
     public byte[] getHeaderIdentifier()
     {
         return AMQP_SASL_1_0_0_HEADER;
     }
 
+    @Override
     public ProtocolEngine newProtocolEngine(Broker<?> broker,
                                             ServerNetworkConnection network,
                                             AmqpPort<?> port,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
index ed15fbe..6c56625 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
@@ -44,11 +44,13 @@ public class QueueDestination extends MessageSourceDestination implements Receiv
         _address = address;
     }
 
+    @Override
     public Outcome[] getOutcomes()
     {
         return OUTCOMES;
     }
 
+    @Override
     public Outcome send(final ServerMessage<?> message, final ServerTransaction txn, final SecurityToken securityToken)
     {
         getQueue().authorisePublish(securityToken, Collections.emptyMap());
@@ -58,6 +60,7 @@ public class QueueDestination extends MessageSourceDestination implements Receiv
             MessageReference _reference = message.newReference();
 
 
+            @Override
             public void postCommit(MessageEnqueueRecord... records)
             {
                 try
@@ -70,6 +73,7 @@ public class QueueDestination extends MessageSourceDestination implements Receiv
                 }
             }
 
+            @Override
             public void onRollback()
             {
                 _reference.release();
@@ -80,6 +84,7 @@ public class QueueDestination extends MessageSourceDestination implements Receiv
         return ACCEPTED;
     }
 
+    @Override
     public int getCredit()
     {
         // TODO - fix

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
index 0b36c14..cbcccf5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
@@ -681,11 +681,13 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target>
                             txn.dequeue(Collections.singleton(queueEntry),
                                         new ServerTransaction.Action()
                                         {
+                                            @Override
                                             public void postCommit()
                                             {
                                                 queueEntry.delete();
                                             }
 
+                                            @Override
                                             public void onRollback()
                                             {
                                             }
@@ -701,11 +703,13 @@ public class SendingLinkEndpoint extends AbstractLinkEndpoint<Source, Target>
                         txn.dequeue(Collections.singleton(queueEntry),
                                     new ServerTransaction.Action()
                                     {
+                                        @Override
                                         public void postCommit()
                                         {
                                             queueEntry.release(oldConsumer);
                                         }
 
+                                        @Override
                                         public void onRollback()
                                         {
                                         }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java
index 8bb01ce..daf048d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java
@@ -78,6 +78,7 @@ public class SequenceNumber implements Comparable<SequenceNumber>
         return _seqNo;
     }
 
+    @Override
     public int compareTo(SequenceNumber o)
     {
         return _seqNo - o._seqNo;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
index 22c49b1..e08399c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
@@ -229,11 +229,13 @@ public class StandardReceivingLinkEndpoint extends AbstractReceivingLinkEndpoint
                         ServerTransaction.Action a;
                         transaction.addPostTransactionAction(new ServerTransaction.Action()
                         {
+                            @Override
                             public void postCommit()
                             {
                                 updateDisposition(delivery.getDeliveryTag(), null, true);
                             }
 
+                            @Override
                             public void onRollback()
                             {
                                 updateDisposition(delivery.getDeliveryTag(), null, true);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
index 79f0d39..0545f76 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
@@ -31,6 +31,7 @@ public abstract class ArrayTypeConstructor implements TypeConstructor<Object[]>
 {
 
 
+    @Override
     public Object[] construct(final List<QpidByteBuffer> in, final ValueHandler handler) throws AmqpErrorException
     {
         int size = read(in);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
index 990371d..169f637 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
@@ -59,11 +59,13 @@ final class BinaryString
     }
 
 
+    @Override
     public final int hashCode()
     {
         return _hashCode;
     }
 
+    @Override
     public final boolean equals(Object o)
     {
         if(!(o instanceof BinaryString))

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java
index 1d4f3f8..8d54691 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java
@@ -40,6 +40,7 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
             new CompoundTypeAssembler.Factory()
             {
 
+                @Override
                 public CompoundTypeAssembler newInstance()
                 {
                     return new ListAssembler();
@@ -52,16 +53,19 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
     {
         private List _list;
 
+        @Override
         public void init(final int count) throws AmqpErrorException
         {
             _list = new ArrayList(count);
         }
 
+        @Override
         public void addItem(final Object obj) throws AmqpErrorException
         {
             _list.add(obj);
         }
 
+        @Override
         public List complete() throws AmqpErrorException
         {
             return _list;
@@ -81,6 +85,7 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
             new CompoundTypeAssembler.Factory<Map>()
             {
 
+                @Override
                 public CompoundTypeAssembler<Map> newInstance()
                 {
                     return new MapAssembler();
@@ -94,6 +99,7 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
         private static final Object NOT_A_KEY = new Object();
 
 
+        @Override
         public void init(final int count) throws AmqpErrorException
         {
             // Can't have an odd number of elements in a map
@@ -110,6 +116,7 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
             _lastKey = NOT_A_KEY;
         }
 
+        @Override
         public void addItem(final Object obj) throws AmqpErrorException
         {
             if(_lastKey != NOT_A_KEY)
@@ -133,6 +140,7 @@ public class CompoundTypeConstructor<T> extends VariableWidthTypeConstructor<T>
 
         }
 
+        @Override
         public Map complete() throws AmqpErrorException
         {
             return _map;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
index 6caa59e..2a98164 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
@@ -29,6 +29,7 @@ public class DefaultDescribedTypeConstructor extends AbstractDescribedTypeConstr
         _descriptor = descriptor;
     }
 
+    @Override
     public Object construct(final Object underlying)
     {
         return new DescribedType(_descriptor, underlying);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
index 55588a1..5fcba82 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
@@ -178,6 +178,7 @@ public class ValueHandler implements DescribedTypeConstructorRegistry.Source
     }
 
 
+    @Override
     public DescribedTypeConstructorRegistry getDescribedTypeRegistry()
     {
         return _describedTypeConstructorRegistry;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
index 581c3c5..06bb3e8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
@@ -55,6 +55,7 @@ public class FrameHandler implements ProtocolHandler
         _isSasl = isSasl;
     }
 
+    @Override
     public ProtocolHandler parse(QpidByteBuffer in)
     {
         try
@@ -228,6 +229,7 @@ public class FrameHandler implements ProtocolHandler
         return error;
     }
 
+    @Override
     public boolean isDone()
     {
         return _errored || _connectionHandler.closedForInput();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
index a04691c..77ae8e3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
@@ -33,6 +33,7 @@ public class SectionEncoderImpl implements SectionEncoder
         _registry = describedTypeRegistry;
     }
 
+    @Override
     public QpidByteBuffer encodeObject(Object obj)
     {
         final ValueWriter<Object> valueWriter = _registry.getValueWriter(obj);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java
index 97db045..4efa3e1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java
@@ -45,11 +45,13 @@ public class Binary
         return ByteBuffer.wrap(_data);
     }
 
+    @Override
     public final int hashCode()
     {
         return _hashCode;
     }
 
+    @Override
     public final boolean equals(Object o)
     {
         if(o instanceof Binary)
@@ -69,6 +71,7 @@ public class Binary
     }
 
 
+    @Override
     public String toString()
     {
         StringBuilder str = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java
index fc7f74c..94d57de 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java
@@ -34,21 +34,25 @@ public final class Symbol implements Comparable<Symbol>, CharSequence
         _underlying = underlying;
     }
 
+    @Override
     public int length()
     {
         return _underlying.length();
     }
 
+    @Override
     public int compareTo(Symbol o)
     {
         return _underlying.compareTo(o._underlying);
     }
 
+    @Override
     public char charAt(int index)
     {
         return _underlying.charAt(index);
     }
 
+    @Override
     public CharSequence subSequence(int beginIndex, int endIndex)
     {
         return _underlying.subSequence(beginIndex, endIndex);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
index 12104b6..8e2d385 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
@@ -99,6 +99,7 @@ public final class UnsignedByte extends Number implements Comparable<UnsignedByt
         return true;
     }
 
+    @Override
     public int compareTo(UnsignedByte o)
     {
         return Integer.signum(intValue() - o.intValue());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
index 81b9e98..d571f0a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
@@ -92,6 +92,7 @@ public final class UnsignedInteger extends Number implements Comparable<Unsigned
         return true;
     }
 
+    @Override
     public int compareTo(UnsignedInteger o)
     {
         return Long.signum(longValue() - o.longValue());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
index ea7e8a6..510efda 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
@@ -110,6 +110,7 @@ public final class UnsignedLong extends Number implements Comparable<UnsignedLon
         return true;
     }
 
+    @Override
     public int compareTo(UnsignedLong o)
     {
         return bigIntegerValue().compareTo(o.bigIntegerValue());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
index 439cd43..ba20b69 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
@@ -43,6 +43,7 @@ public final class UnsignedShort extends Number implements Comparable<UnsignedSh
         _underlying = underlying;
     }
 
+    @Override
     public short shortValue()
     {
         return _underlying;
@@ -94,6 +95,7 @@ public final class UnsignedShort extends Number implements Comparable<UnsignedSh
         return true;
     }
 
+    @Override
     public int compareTo(UnsignedShort o)
     {
         return Integer.signum(intValue() - o.intValue());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
index faba33e..0174b21 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
@@ -76,11 +76,13 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist
 
 
 
+    @Override
     public void register(Object descriptor, DescribedTypeConstructor constructor)
     {
         _constructorRegistry.put(descriptor, constructor);
     }
 
+    @Override
     public DescribedTypeConstructor getConstructor(Object descriptor)
     {
         return _constructorRegistry.get(descriptor);
@@ -321,6 +323,7 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist
     private final Map<Class, ValueWriter.Factory> _writerMap = new HashMap<Class, ValueWriter.Factory>();
 
 
+    @Override
     public <V extends Object> ValueWriter<V> getValueWriter(V value)
     {
         ValueWriter writer;
@@ -378,6 +381,7 @@ public class AMQPDescribedTypeRegistry implements DescribedTypeConstructorRegist
 
     }
 
+    @Override
     public <V extends Object> ValueWriter<V> register(Class<V> clazz, ValueWriter.Factory<V> writer)
     {
         return (ValueWriter<V>) _writerMap.put(clazz, writer);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
index dbf2888..d91c13c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
@@ -35,6 +35,7 @@ public class AmqpSequence implements NonEncodingRetainingSection<List>
         _value = value;
     }
 
+    @Override
     public List getValue()
     {
         return _value;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
index b8449b6..e799c29 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
@@ -35,6 +35,7 @@ public class ApplicationProperties implements NonEncodingRetainingSection<Map<St
         _value = value;
     }
 
+    @Override
     public Map<String,Object> getValue()
     {
         return _value;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
index 9352064..c555966 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
@@ -33,6 +33,7 @@ public class Data implements NonEncodingRetainingSection<Binary>
         _value = value;
     }
 
+    @Override
     public Binary getValue()
     {
         return _value;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
index 88a9333..5b06eb0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
@@ -48,11 +48,13 @@ public class StdDistMode
         _val = val;
     }
 
+    @Override
     public Symbol getValue()
     {
         return _val;
     }
 
+    @Override
     public String toString()
     {
         

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
index d2df16e..295d1f1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
@@ -50,11 +50,13 @@ public class TerminusDurability
         _val = val;
     }
 
+    @Override
     public UnsignedInteger getValue()
     {
         return _val;
     }
 
+    @Override
     public String toString()
     {
         

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
index bdf3501..3d7d850 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
@@ -52,11 +52,13 @@ public class TerminusExpiryPolicy
         _val = val;
     }
 
+    @Override
     public Symbol getValue()
     {
         return _val;
     }
 
+    @Override
     public String toString()
     {
         

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java
index 24806f8..f5f83e8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedConstructor.java
@@ -48,6 +48,7 @@ public class AcceptedConstructor extends AbstractDescribedTypeConstructor<Accept
         }
     }
 
+    @Override
     public Accepted construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
index 4765461..cd7a31d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
@@ -49,6 +49,7 @@ public class AmqpSequenceConstructor extends AbstractDescribedTypeConstructor<Am
     }
 
 
+    @Override
     public AmqpSequence construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
index 9ae558b..ae976de 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
@@ -47,6 +47,7 @@ public class AmqpValueConstructor extends AbstractDescribedTypeConstructor<AmqpV
     }
 
 
+    @Override
     public AmqpValue construct(Object underlying)
     {
         return new AmqpValue(underlying);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
index 9cc6f71..1c8cccb 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
@@ -49,6 +49,7 @@ public class ApplicationPropertiesConstructor extends AbstractDescribedTypeConst
     }
 
 
+    @Override
     public ApplicationProperties construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
index 0905345..a7c2c60 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
@@ -48,6 +48,7 @@ public class DataConstructor extends AbstractDescribedTypeConstructor<Data>
     }
 
 
+    @Override
     public Data construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java
index 410c816..2f33bc1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseConstructor.java
@@ -48,6 +48,7 @@ public class DeleteOnCloseConstructor extends AbstractDescribedTypeConstructor<D
         }
     }
 
+    @Override
     public DeleteOnClose construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
index a665273..2ac88ce 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
@@ -48,6 +48,7 @@ public class DeleteOnNoLinksConstructor extends AbstractDescribedTypeConstructor
         }
     }
 
+    @Override
     public DeleteOnNoLinks construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
index 31fba8f..c3cb84f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
@@ -48,6 +48,7 @@ public class DeleteOnNoLinksOrMessagesConstructor extends AbstractDescribedTypeC
         }
     }
 
+    @Override
     public DeleteOnNoLinksOrMessages construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
index 174d5a3..f4aa8b6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
@@ -48,6 +48,7 @@ public class DeleteOnNoMessagesConstructor extends AbstractDescribedTypeConstruc
         }
     }
 
+    @Override
     public DeleteOnNoMessages construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
index e23b078..70c92b3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
@@ -49,6 +49,7 @@ public class DeliveryAnnotationsConstructor extends AbstractDescribedTypeConstru
     }
 
 
+    @Override
     public DeliveryAnnotations construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
index 111717f..063e61b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
@@ -46,6 +46,7 @@ public class ExactSubjectFilterConstructor extends AbstractDescribedTypeConstruc
     }
 
 
+    @Override
     public ExactSubjectFilter construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
index 6fb68a8..b345866 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
@@ -49,6 +49,7 @@ public class FooterConstructor extends AbstractDescribedTypeConstructor<Footer>
     }
 
 
+    @Override
     public Footer construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
index c60b5a7..cd16a69 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderConstructor.java
@@ -50,6 +50,7 @@ public class HeaderConstructor extends AbstractDescribedTypeConstructor<Header>
         }
     }
 
+    @Override
     public Header construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
index 04f5d4c..a232070 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
@@ -48,6 +48,7 @@ public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstruct
     }
 
 
+    @Override
     public JMSSelectorFilter construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
index 3908de9..a66fd47 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
@@ -47,6 +47,7 @@ public class MatchingSubjectFilterConstructor extends AbstractDescribedTypeConst
     }
 
 
+    @Override
     public MatchingSubjectFilter construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
index 06067ab..956b6fd 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
@@ -49,6 +49,7 @@ public class MessageAnnotationsConstructor extends AbstractDescribedTypeConstruc
     }
 
 
+    @Override
     public MessageAnnotations construct(Object underlying)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java
index a498534..8b971ab 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedConstructor.java
@@ -48,6 +48,7 @@ public class ModifiedConstructor extends AbstractDescribedTypeConstructor<Modifi
         }
     }
 
+    @Override
     public Modified construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
index 0a3a824..86052c5 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
@@ -47,6 +47,7 @@ public class NoLocalFilterConstructor extends AbstractDescribedTypeConstructor<N
     }
 
 
+    @Override
     public NoLocalFilter construct(Object underlying)
     {
         return NoLocalFilter.INSTANCE;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java
index 19561fc..e3b226d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesConstructor.java
@@ -51,6 +51,7 @@ public class PropertiesConstructor extends AbstractDescribedTypeConstructor<Prop
         }
     }
 
+    @Override
     public Properties construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java
index 006150a..6fca7c7 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedConstructor.java
@@ -48,6 +48,7 @@ public class ReceivedConstructor extends AbstractDescribedTypeConstructor<Receiv
         }
     }
 
+    @Override
     public Received construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java
index 3ccee9f..f4941e0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedConstructor.java
@@ -47,6 +47,7 @@ public class RejectedConstructor extends AbstractDescribedTypeConstructor<Reject
         }
     }
 
+    @Override
     public Rejected construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java
index 4b596d4..605ea2b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedConstructor.java
@@ -47,6 +47,7 @@ public class ReleasedConstructor extends AbstractDescribedTypeConstructor<Releas
         }
     }
 
+    @Override
     public Released construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java
index 563f6c2..7156c06 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceConstructor.java
@@ -50,6 +50,7 @@ public class SourceConstructor extends AbstractDescribedTypeConstructor<Source>
         }
     }
 
+    @Override
     public Source construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java
index cc74e05..2294acc 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetConstructor.java
@@ -50,6 +50,7 @@ public class TargetConstructor extends AbstractDescribedTypeConstructor<Target>
         }
     }
 
+    @Override
     public Target construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java
index 3fc5aa4..ac28d18 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java
@@ -66,6 +66,7 @@ public class SaslChallenge
         return builder.toString();
     }
 
+    @Override
     public void invoke(final int channel, SASLEndpoint conn)
     {
         conn.receiveSaslChallenge(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java
index f326ee1..7894104 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java
@@ -54,11 +54,13 @@ public class SaslCode
         _val = val;
     }
 
+    @Override
     public UnsignedByte getValue()
     {
         return _val;
     }
 
+    @Override
     public String toString()
     {
         

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java
index a2530d7..54d02e0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java
@@ -110,6 +110,7 @@ public class SaslInit
         return builder.toString();
     }
 
+    @Override
     public void invoke(final int channel, SASLEndpoint conn)
     {
         conn.receiveSaslInit(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java
index 9bdbc76..3817839 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java
@@ -67,6 +67,7 @@ public class SaslMechanisms
         return builder.toString();
     }
 
+    @Override
     public void invoke(final int channel, SASLEndpoint conn)
     {
         conn.receiveSaslMechanisms(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java
index 4854923..9c1c3b7 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java
@@ -88,6 +88,7 @@ public class SaslOutcome
         return builder.toString();
     }
 
+    @Override
     public void invoke(final int channel, SASLEndpoint conn)
     {
         conn.receiveSaslOutcome(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java
index 0946c5f..848ff1b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java
@@ -66,6 +66,7 @@ public class SaslResponse
         return builder.toString();
     }
 
+    @Override
     public void invoke(final int channel, SASLEndpoint conn)
     {
         conn.receiveSaslResponse(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java
index 1863f7f..3f1c93b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeConstructor.java
@@ -48,6 +48,7 @@ public class SaslChallengeConstructor extends AbstractDescribedTypeConstructor<S
         }
     }
 
+    @Override
     public SaslChallenge construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java
index acddd57..bb0a882 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitConstructor.java
@@ -48,6 +48,7 @@ public class SaslInitConstructor extends AbstractDescribedTypeConstructor<SaslIn
         }
     }
 
+    @Override
     public SaslInit construct(Object underlying)
     {
         if(underlying instanceof List)


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