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/SaslMechanismsConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
index 64cb975..7af4d03 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
@@ -48,6 +48,7 @@ public class SaslMechanismsConstructor extends 
AbstractDescribedTypeConstructor<
         }
     }
 
+    @Override
     public SaslMechanisms 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/SaslOutcomeConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
index 8626732..eb8b0fd 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
@@ -48,6 +48,7 @@ public class SaslOutcomeConstructor extends 
AbstractDescribedTypeConstructor<Sas
         }
     }
 
+    @Override
     public SaslOutcome 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/SaslResponseConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
index 5b5787e..14ab4aa 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
@@ -48,6 +48,7 @@ public class SaslResponseConstructor extends 
AbstractDescribedTypeConstructor<Sa
         }
     }
 
+    @Override
     public SaslResponse 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/transaction/TransactionErrors.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
index 9e9757c..b065585 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
@@ -50,11 +50,13 @@ public class TransactionErrors
         _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/transaction/TxnCapabilities.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
index b8afe0b..3759fce 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
@@ -57,11 +57,13 @@ public class TxnCapabilities
         _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/transaction/TxnCapability.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapability.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapability.java
index 9b7dbbc..df16c49 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapability.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapability.java
@@ -54,11 +54,13 @@ public class TxnCapability
         _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/transaction/codec/CoordinatorConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java
index 10cbed1..657accb 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorConstructor.java
@@ -48,6 +48,7 @@ public class CoordinatorConstructor extends 
AbstractDescribedTypeConstructor<Coo
         }
     }
 
+    @Override
     public Coordinator 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/transaction/codec/DeclareConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java
index ec0d130..3fc1f42 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareConstructor.java
@@ -49,6 +49,7 @@ public class DeclareConstructor extends 
AbstractDescribedTypeConstructor<Declare
         }
     }
 
+    @Override
     public Declare 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/transaction/codec/DeclaredConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java
index 7800708..6b6e380 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredConstructor.java
@@ -48,6 +48,7 @@ public class DeclaredConstructor extends 
AbstractDescribedTypeConstructor<Declar
         }
     }
 
+    @Override
     public Declared 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/transaction/codec/DischargeConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java
index 9604eae..f3c0611 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeConstructor.java
@@ -48,6 +48,7 @@ public class DischargeConstructor extends 
AbstractDescribedTypeConstructor<Disch
         }
     }
 
+    @Override
     public Discharge 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/transaction/codec/TransactionalStateConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java
index 4bb7c56..05a1cf2 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateConstructor.java
@@ -48,6 +48,7 @@ public class TransactionalStateConstructor extends 
AbstractDescribedTypeConstruc
         }
     }
 
+    @Override
     public TransactionalState 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/transport/Attach.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
index e87952c..a821be5 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
@@ -358,6 +358,7 @@ public class Attach implements FrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveAttach(channel, 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/transport/Begin.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
index d713524..4a280e4 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
@@ -222,6 +222,7 @@ public class Begin implements FrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveBegin(channel, 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/transport/Close.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
index 5fcee18..2505ca1 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
@@ -33,6 +33,7 @@ public class Close implements ErrorCarryingFrameBody
     @CompositeTypeField
     private Error _error;
 
+    @Override
     public Error getError()
     {
         return _error;
@@ -62,6 +63,7 @@ public class Close implements ErrorCarryingFrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveClose(channel, 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/transport/ConnectionError.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ConnectionError.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ConnectionError.java
index b7a6cfd..491984b 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ConnectionError.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ConnectionError.java
@@ -73,11 +73,13 @@ public class ConnectionError implements ErrorCondition, 
RestrictedType<Symbol>
         return null;
     }
 
+    @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/transport/Detach.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
index bccc719..59454e2 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
@@ -60,6 +60,7 @@ public class Detach implements ErrorCarryingFrameBody
         _closed = closed;
     }
 
+    @Override
     public Error getError()
     {
         return _error;
@@ -107,6 +108,7 @@ public class Detach implements ErrorCarryingFrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveDetach(channel, 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/transport/Disposition.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
index a0a0f15..133f8c4 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
@@ -174,6 +174,7 @@ public class Disposition implements FrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveDisposition(channel, 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/transport/End.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
index 6c60f1b..0756790 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
@@ -33,6 +33,7 @@ public class End implements ErrorCarryingFrameBody
     @CompositeTypeField
     private Error _error;
 
+    @Override
     public Error getError()
     {
         return _error;
@@ -62,6 +63,7 @@ public class End implements ErrorCarryingFrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveEnd(channel, 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/transport/Flow.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
index 14f5be0..ce9d63c 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
@@ -286,6 +286,7 @@ public class Flow implements FrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveFlow(channel, 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/transport/LinkError.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/LinkError.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/LinkError.java
index 4a824c5..4c4e08a 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/LinkError.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/LinkError.java
@@ -78,11 +78,13 @@ public class LinkError implements ErrorCondition, 
RestrictedType<Symbol>
         return null;
     }
 
+    @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/transport/ReceiverSettleMode.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java
index ffe4837..89a8fee 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java
@@ -57,11 +57,13 @@ public class ReceiverSettleMode implements 
RestrictedType<UnsignedByte>
         return null;
     }
 
+    @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/transport/Role.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java
index d90795e..c8d5619 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java
@@ -56,11 +56,13 @@ public class Role implements RestrictedType<Boolean>
         return null;
     }
 
+    @Override
     public Boolean 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/transport/SenderSettleMode.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java
index ef6d8c6..4ada342 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java
@@ -63,11 +63,13 @@ public class SenderSettleMode implements 
RestrictedType<UnsignedByte>
         return null;
     }
 
+    @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/transport/SessionError.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java
index b6070cb..49b40b1 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java
@@ -72,11 +72,13 @@ public class SessionError implements ErrorCondition, 
RestrictedType<Symbol>
         return null;
     }
 
+    @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/transport/Transfer.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
index 6042319..75cd9dc 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
@@ -290,6 +290,7 @@ public class Transfer implements FrameBody
         return builder.toString();
     }
 
+    @Override
     public void invoke(int channel, ConnectionHandler conn)
     {
         conn.receiveTransfer(channel, 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/transport/codec/AttachConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java
index 7923ccd..7d68efe 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachConstructor.java
@@ -49,6 +49,7 @@ public class AttachConstructor extends 
AbstractDescribedTypeConstructor<Attach>
         }
     }
 
+    @Override
     public Attach 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/transport/codec/BeginConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java
index 9b7d5d9..6acb6cc 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginConstructor.java
@@ -49,6 +49,7 @@ public class BeginConstructor extends 
AbstractDescribedTypeConstructor<Begin>
         }
     }
 
+    @Override
     public Begin 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/transport/codec/CloseConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java
index d01cf99..fd8d957 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseConstructor.java
@@ -48,6 +48,7 @@ public class CloseConstructor extends 
AbstractDescribedTypeConstructor<Close>
         }
     }
 
+    @Override
     public Close 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/transport/codec/DetachConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java
index f6b995a..9d0efea 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachConstructor.java
@@ -48,6 +48,7 @@ public class DetachConstructor extends 
AbstractDescribedTypeConstructor<Detach>
         }
     }
 
+    @Override
     public Detach 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/transport/codec/DispositionConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java
index a54b77c..03755de 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionConstructor.java
@@ -48,6 +48,7 @@ public class DispositionConstructor extends 
AbstractDescribedTypeConstructor<Dis
         }
     }
 
+    @Override
     public Disposition 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/transport/codec/EndConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java
index e62d0eb..6bc3958 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndConstructor.java
@@ -48,6 +48,7 @@ public class EndConstructor extends 
AbstractDescribedTypeConstructor<End>
         }
     }
 
+    @Override
     public End 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/transport/codec/ErrorConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java
index e50bc24..cbbbf78 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorConstructor.java
@@ -51,6 +51,7 @@ public class ErrorConstructor extends 
AbstractDescribedTypeConstructor<Error>
         }
     }
 
+    @Override
     public org.apache.qpid.server.protocol.v1_0.type.transport.Error 
construct(Object underlying)
     {
         if(underlying instanceof List)
@@ -180,6 +181,7 @@ public class ErrorConstructor extends 
AbstractDescribedTypeConstructor<Error>
             _value = value;
         }
 
+        @Override
         public Symbol 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/transport/codec/FlowConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java
index d252976..6031f11 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowConstructor.java
@@ -49,6 +49,7 @@ public class FlowConstructor extends 
AbstractDescribedTypeConstructor<Flow>
         }
     }
 
+    @Override
     public Flow 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/transport/codec/OpenConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java
index 768e551..3716690 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenConstructor.java
@@ -51,6 +51,7 @@ public class OpenConstructor extends 
AbstractDescribedTypeConstructor<Open>
         }
     }
 
+    @Override
     public Open 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/transport/codec/TransferConstructor.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java
index c125b0b..cfe641c 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferConstructor.java
@@ -48,6 +48,7 @@ public class TransferConstructor extends 
AbstractDescribedTypeConstructor<Transf
         }
     }
 
+    @Override
     public Transfer construct(Object underlying)
     {
         if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
 
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
index 54e323e..851374a 100644
--- 
a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
+++ 
b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java
@@ -48,6 +48,7 @@ import 
org.apache.qpid.server.protocol.v0_10.transport.ReplyTo;
 public class MessageConverter_1_0_to_v0_10 implements 
MessageConverter<Message_1_0, MessageTransferMessage>
 {
 
+    @Override
     public Class<Message_1_0> getInputClass()
     {
         return Message_1_0.class;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
 
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index d7528f8..2300171 100644
--- 
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ 
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
@@ -53,6 +53,7 @@ public class MessageConverter_0_8_to_1_0 extends 
MessageConverter_to_1_0<AMQMess
         return AMQMessage.class;
     }
 
+    @Override
     protected MessageMetaData_1_0 convertMetaData(final AMQMessage 
serverMessage,
                                                   final 
EncodingRetainingSection<?> bodySection,
                                                   SectionEncoder 
sectionEncoder)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
 
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
index d247a8f..c1e5c0a 100644
--- 
a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
+++ 
b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java
@@ -49,6 +49,7 @@ public class MessageConverter_1_0_to_v0_8 implements 
MessageConverter<Message_1_
     private static final int BASIC_CLASS_ID = 60;
 
 
+    @Override
     public Class<Message_1_0> getInputClass()
     {
         return Message_1_0.class;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
index 6e1c5fc..c79b08c 100644
--- 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
+++ 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
@@ -29,15 +29,19 @@ import 
org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
 public interface DerbySystemConfig<X extends DerbySystemConfig<X>> extends 
SystemConfig<X>, FileBasedSettings,
                                                                            
SizeMonitoringSettings
 {
+    @Override
     @ManagedAttribute(defaultValue = 
"${qpid.work_dir}${file.separator}config.json")
     String getStorePath();
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = "0")
     Long getStoreUnderfullSize();
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = "0")
     Long getStoreOverfullSize();
 
+    @Override
     @ManagedAttribute( description = "Configuration for the preference store, 
e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
index 960c099..b4c5c75 100644
--- 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
+++ 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
@@ -32,12 +32,15 @@ public interface DerbyVirtualHost<X extends 
DerbyVirtualHost<X>> extends QueueMa
 {
     String STORE_PATH = "storePath";
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = 
"${qpid.work_dir}${file.separator}${this:name}${file.separator}messages")
     String getStorePath();
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = "0")
     Long getStoreUnderfullSize();
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = "0")
     Long getStoreOverfullSize();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
index 2c3bd87..cc07794 100644
--- 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
+++ 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
@@ -31,9 +31,11 @@ public interface DerbyVirtualHostNode<X extends 
DerbyVirtualHostNode<X>>
 {
     String STORE_PATH = "storePath";
 
+    @Override
     @ManagedAttribute(mandatory = true, defaultValue = 
"${qpid.work_dir}${file.separator}${this:name}${file.separator}config")
     String getStorePath();
 
+    @Override
     @ManagedAttribute(description = "Configuration for the preference store, 
e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
 
b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
index d074d68..9238658 100644
--- 
a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
+++ 
b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeTest.java
@@ -62,6 +62,7 @@ public class DerbyVirtualHostNodeTest extends QpidTestCase
         _broker = createBroker();
     }
 
+    @Override
     public void tearDown() throws Exception
     {
         try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
 
b/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
index 129ba96..3f668e9 100644
--- 
a/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
+++ 
b/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
@@ -47,6 +47,7 @@ public class BoneCPConnectionProviderFactory implements 
JDBCConnectionProviderFa
         return "BONECP";
     }
 
+    @Override
     public ConnectionProvider getConnectionProvider(String connectionUrl, 
String username, String password, Map<String, String> providerAttributes)
             throws SQLException
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
index f8fe98c..7aad22f 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
@@ -1919,11 +1919,13 @@ public abstract class AbstractJDBCMessageStore 
implements MessageStore
             _messageNumber = messageNumber;
         }
 
+        @Override
         public UUID getQueueId()
         {
             return _queueId;
         }
 
+        @Override
         public long getMessageNumber()
         {
             return _messageNumber;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
index 29441f2..5aba1f8 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
@@ -87,6 +87,7 @@ public abstract class GenericAbstractJDBCMessageStore extends 
AbstractJDBCMessag
 
     protected abstract void doClose();
 
+    @Override
     protected boolean isMessageStoreOpen()
     {
         return _messageStoreOpen.get();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
index ac07e0d..1b3c827 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
@@ -123,6 +123,7 @@ public class GenericJDBCMessageStore extends 
GenericAbstractJDBCMessageStore
         return _connectionProvider.getConnection();
     }
 
+    @Override
     protected void doClose()
     {
         try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
index 4bb7bb0..d37e864 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
@@ -29,6 +29,7 @@ import org.apache.qpid.server.plugin.QpidServiceLoader;
 
 public interface JDBCConnectionProviderFactory extends Pluggable
 {
+    @Override
     String getType();
 
     ConnectionProvider getConnectionProvider(String connectionUrl, String 
username, String password, Map<String, String> providerAttributes)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
index 722cc77..67c83cd 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
@@ -27,18 +27,23 @@ import 
org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
 
 public interface JDBCSystemConfig<X extends JDBCSystemConfig<X>> extends 
SystemConfig<X>, JDBCSettings
 {
+    @Override
     @ManagedAttribute(mandatory=true, defaultValue = 
"${systemConfig.connectionUrl}")
     String getConnectionUrl();
 
+    @Override
     @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE)
     String getConnectionPoolType();
 
+    @Override
     @ManagedAttribute(defaultValue = "${systemConfig.username}")
     String getUsername();
 
+    @Override
     @ManagedAttribute(secure=true, defaultValue = "${systemConfig.password}")
     String getPassword();
 
+    @Override
     @ManagedAttribute( description = "Configuration for the preference store, 
e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();
@@ -46,6 +51,7 @@ public interface JDBCSystemConfig<X extends 
JDBCSystemConfig<X>> extends SystemC
     @ManagedContextDefault(name = "systemConfig.tableNamePrefix")
     String DEFAULT_SYSTEM_CONFIG_TABLE_NAME_PREFIX = "";
 
+    @Override
     @ManagedAttribute(secure = true,
             description = "Optional database table prefix so multiple 
SystemConfigs can share the same database",
             defaultValue = "${systemConfig.tableNamePrefix}",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
index a955988..7e7ee14 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java
@@ -28,16 +28,20 @@ import 
org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
 public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends 
QueueManagingVirtualHost<X>,
                                                                        
JDBCSettings
 {
+    @Override
     @ManagedAttribute(mandatory=true)
     String getConnectionUrl();
 
+    @Override
     @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE,
             validValues = 
{"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"}
 )
     String getConnectionPoolType();
 
+    @Override
     @ManagedAttribute
     String getUsername();
 
+    @Override
     @ManagedAttribute(secure=true)
     String getPassword();
 
@@ -45,6 +49,7 @@ public interface JDBCVirtualHost<X extends 
JDBCVirtualHost<X>> extends QueueMana
             description = "Default value for optional database table prefix")
     String DEFAULT_JDBC_VIRTUALHOST_TABLE_NAME_PREFIX = "";
 
+    @Override
     @ManagedAttribute(
             description = "Optional database table prefix so multiple 
VirtualHosts can share the same database",
             defaultValue = "${jdbcvirtualhost.tableNamePrefix}",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
index f308be8..8b4557e 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java
@@ -31,19 +31,24 @@ import 
org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
 public interface JDBCVirtualHostNode<X extends JDBCVirtualHostNode<X>> extends 
VirtualHostNode<X>, JDBCSettings,
                                                                                
PreferenceStoreProvider
 {
+    @Override
     @ManagedAttribute(mandatory=true)
     String getConnectionUrl();
 
+    @Override
     @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE,
             validValues = 
{"org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory#getAllAvailableConnectionProviderTypes()"}
 )
     String getConnectionPoolType();
 
+    @Override
     @ManagedAttribute
     String getUsername();
 
+    @Override
     @ManagedAttribute(secure=true)
     String getPassword();
 
+    @Override
     @ManagedAttribute( description = "Configuration for the preference store, 
e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();
@@ -52,6 +57,7 @@ public interface JDBCVirtualHostNode<X extends 
JDBCVirtualHostNode<X>> extends V
             description = "Default value for optional database table prefix")
     String DEFAULT_JDBC_VIRTUALHOSTNODE_TABLE_NAME_PREFIX = "";
 
+    @Override
     @ManagedAttribute(
             description = "Optional database table prefix so multiple 
VirtualHostNodes can share the same database",
             defaultValue = "${jdbcvirtualhostnode.tableNamePrefix}",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
index 5108d2d..866f96e 100644
--- 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
+++ 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
@@ -84,6 +84,7 @@ class BrokerUserOrConnectionLogInclusionRuleImpl
         return _connectionName;
     }
 
+    @Override
     @SuppressWarnings("unused")
     public String getRemoteContainerId()
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
index 6d5eb00..825a01d 100644
--- 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
+++ 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
@@ -99,6 +99,7 @@ public class LoggerNameAndLevelFilter extends 
Filter<ILoggingEvent> implements E
         }
     }
 
+    @Override
     public Level getEffectiveLevel(final Logger logger)
     {
         if((_loggerName == null || "".equals(_loggerName) || 
Logger.ROOT_LOGGER_NAME.equals(_loggerName))

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
index 71370d1..5a37989 100644
--- 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
+++ 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
@@ -48,6 +48,7 @@ class PredicateAndLoggerNameAndLevelFilter extends 
LoggerNameAndLevelFilter
         return _filter.decide(event);
     }
 
+    @Override
     protected Filter<ILoggingEvent> createFilter(final String loggerName)
     {
         final Filter<ILoggingEvent> filter = super.createFilter(loggerName);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
index c84fcbd..a826aa7 100644
--- 
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
+++ 
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
@@ -39,12 +39,14 @@ public class RecordEventAppender extends 
AppenderBase<ILoggingEvent>
         _recordId = new AtomicLong();
     }
 
+    @Override
     public void start()
     {
         _buffer = new CyclicBuffer<>(_size);
         super.start();
     }
 
+    @Override
     public void stop()
     {
         _buffer = null;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
index e70a43d..6737f4f 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
@@ -94,12 +94,14 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
     {
         ScheduledExecutorService executorService = 
mock(ScheduledExecutorService.class);
         doAnswer(new Answer() {
+            @Override
             public Object answer(InvocationOnMock invocation) {
                 Object[] args = invocation.getArguments();
                 ((Runnable)args[0]).run();
                 return null;
             }}).when(executorService).schedule(any(Runnable.class), 
any(long.class), any(TimeUnit.class));
         doAnswer(new Answer() {
+            @Override
             public Object answer(InvocationOnMock invocation) {
                 Object[] args = invocation.getArguments();
                 ((Runnable)args[0]).run();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
index c9ac47b..3b81dbf 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
@@ -41,6 +41,7 @@ public class RolloverWatcherTest extends QpidTestCase
     private File _baseFolder;
     private File _activeFile;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
index aef74cb..b6f686c 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
@@ -43,6 +43,7 @@ public class VirtualHostLogEventExcludingFilterTest extends 
QpidTestCase
     private ILoggingEvent _loggingEvent;
     private VirtualHostLogEventExcludingFilter _filter;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
index f408519..0dbcaac 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/FileServlet.java
@@ -71,6 +71,7 @@ public class FileServlet extends HttpServlet
         _usePathInfo = usePathInfo;
     }
 
+    @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse 
response) throws ServletException, IOException
     {
         String filename = null;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
index 382613f..ac8503a 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
@@ -118,6 +118,7 @@ public class Token implements java.io.Serializable {
   /**
    * Returns the image.
    */
+  @Override
   public String toString()
   {
     return image;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
index feec8b9..2d4fa14 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
@@ -142,6 +142,7 @@ public class TokenMgrError extends Error
    *
    * from this method for such cases in the release version of your parser.
    */
+  @Override
   public String getMessage() {
     return super.getMessage();
   }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
index 43a9474..d3145fd 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
@@ -37,12 +37,14 @@ public class BrokerQueryServlet extends 
QueryServlet<Broker<?>>
 {
     private static final long serialVersionUID = 1L;
 
+    @Override
     protected Broker<?> getParent(final HttpServletRequest request, final 
ConfiguredObject<?> managedObject)
     {
         return managedObject instanceof Broker ? 
HttpManagementUtil.getBroker(request.getServletContext()) : null;
     }
 
 
+    @Override
     protected Class<? extends ConfiguredObject> getSupportedCategory(final 
String categoryName,
                                                                      final 
Model brokerModel)
     {
@@ -59,6 +61,7 @@ public class BrokerQueryServlet extends 
QueryServlet<Broker<?>>
         return category;
     }
 
+    @Override
     protected String getRequestedCategory(final HttpServletRequest request, 
final ConfiguredObject<?> managedObject)
     {
         List<String> pathInfoElements =
@@ -70,6 +73,7 @@ public class BrokerQueryServlet extends 
QueryServlet<Broker<?>>
         return null;
     }
 
+    @Override
     protected List<ConfiguredObject<?>> getAllObjects(final Broker<?> broker,
                                                       final Class<? extends 
ConfiguredObject> category,
                                                       final HttpServletRequest 
request)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
----------------------------------------------------------------------
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
index 2366f37..84e6b61 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
@@ -67,6 +67,7 @@ public class VirtualHostQueryServlet extends 
QueryServlet<VirtualHost<?>>
         return null;
     }
 
+    @Override
     protected Class<? extends ConfiguredObject> getSupportedCategory(final 
String categoryName,
                                                                      final 
Model brokerModel)
     {
@@ -94,6 +95,7 @@ public class VirtualHostQueryServlet extends 
QueryServlet<VirtualHost<?>>
         }
     }
 
+    @Override
     protected String getRequestedCategory(final HttpServletRequest request, 
final ConfiguredObject<?> managedObject)
     {
         List<String> pathInfoElements =
@@ -109,6 +111,7 @@ public class VirtualHostQueryServlet extends 
QueryServlet<VirtualHost<?>>
         return null;
     }
 
+    @Override
     protected List<ConfiguredObject<?>> getAllObjects(final VirtualHost<?> 
virtualHost,
                                                       final Class<? extends 
ConfiguredObject> category,
                                                       final HttpServletRequest 
request)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker/src/main/java/org/apache/qpid/server/Main.java
----------------------------------------------------------------------
diff --git a/broker/src/main/java/org/apache/qpid/server/Main.java 
b/broker/src/main/java/org/apache/qpid/server/Main.java
index 9b6b71b..d40eae0 100644
--- a/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -404,6 +404,7 @@ public class Main
             handler =
                 new Thread.UncaughtExceptionHandler()
                 {
+                    @Override
                     public void uncaughtException(final Thread t, final 
Throwable e)
                     {
                         boolean continueOnError = 
Boolean.getBoolean("qpid.broker.exceptionHandler.continue");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/Piper.java 
b/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
index 98e3c96..5eb604d 100644
--- a/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
@@ -74,6 +74,7 @@ public final class Piper extends Thread
         }
     }
 
+    @Override
     public void run()
     {
         try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
----------------------------------------------------------------------
diff --git 
a/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
 
b/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
index 65cd60f..452940d 100644
--- 
a/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
+++ 
b/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
@@ -292,6 +292,7 @@ public class QpidJmsClient0xProvider implements JmsProvider
         }
     }
 
+    @Override
     public String getBrokerDetailsFromDefaultConnectionUrl()
     {
         try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
 
b/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
index 7786198..1658b26 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
@@ -69,6 +69,7 @@ public class AMQQueueDeferredOrderingTest extends 
QpidBrokerTestCase
             this.end = end;
         }
 
+        @Override
         public Exception call()
         {
             try
@@ -89,6 +90,7 @@ public class AMQQueueDeferredOrderingTest extends 
QpidBrokerTestCase
         }
     }
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
@@ -137,6 +139,7 @@ public class AMQQueueDeferredOrderingTest extends 
QpidBrokerTestCase
         assertNull("Publishing second batch failed: " + publisherException, 
publisherException);
     }
 
+    @Override
     protected void tearDown() throws Exception
     {
         try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java 
b/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
index 532f183..37cf95d 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
@@ -50,6 +50,7 @@ public class AsynchMessageListenerTest extends 
QpidBrokerTestCase
     private MessageConsumer _consumer;
     private Queue _queue;
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
 
b/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
index 5fa7b2d..f9101e6 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
@@ -1457,6 +1457,7 @@ public class FailoverBehaviourTest extends 
FailoverBaseCase implements Exception
             _delay = delay;
         }
 
+        @Override
         public void attainedConnection()
         {
             try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
 
b/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
index 787e727..e3a85e9 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
@@ -46,6 +46,7 @@ public class AMQPEncodedMapMessageTest extends 
QpidBrokerTestCase
     private MessageProducer _producer;
     private UUID myUUID = UUID.randomUUID();
     
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();
@@ -265,6 +266,7 @@ public class AMQPEncodedMapMessageTest extends 
QpidBrokerTestCase
         return myMap;
     }
     
+    @Override
     public void tearDown() throws Exception
     {
         //clean up

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
 
b/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
index e2cc32e..89cd108 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
@@ -49,6 +49,7 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
     private CountDownLatch _processingStarted;
     private CountDownLatch _processingCompleted;
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
@@ -80,6 +81,7 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
         MessageConsumer prefetch1consumer = 
prefetch1session.createConsumer(queue);
         prefetch1consumer.setMessageListener(new MessageListener()
         {
+            @Override
             public void onMessage(Message message)
             {
                 try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/session/ExchangeDeleteTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/session/ExchangeDeleteTest.java 
b/systests/src/test/java/org/apache/qpid/client/session/ExchangeDeleteTest.java
index b024954..4a7d821 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/session/ExchangeDeleteTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/session/ExchangeDeleteTest.java
@@ -34,6 +34,7 @@ public class ExchangeDeleteTest extends QpidBrokerTestCase
 {
     private Connection _connection;
     private AMQSession<?, ?> _session;
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java 
b/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java
index 6358ed3..748e0fb 100644
--- 
a/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java
@@ -34,6 +34,7 @@ public class QueueDeclareTest extends QpidBrokerTestCase
 {
     private Connection _connection;
     private AMQSession<?, ?> _session;
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java 
b/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java
index ced2509..0430339 100644
--- a/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java
@@ -36,6 +36,7 @@ public class QueueDeleteTest extends QpidBrokerTestCase
 {
     private Connection _connection;
     private AMQSession<?, ?> _session;
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
 
b/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
index 2461bd3..00a95d9 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
@@ -45,6 +45,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
  */
 public class SupportedProtocolVersionsTest extends QpidBrokerTestCase
 {
+    @Override
     public void startDefaultBroker() throws Exception
     {
         // No-op, we call super.startDefaultBroker() from test methods after 
appropriate config overrides

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
 
b/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 7ae4c15..afe76a8 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -277,6 +277,7 @@ public class ReturnUnroutableMandatoryMessageTest extends 
QpidBrokerTestCase imp
         return new 
junit.framework.TestSuite(ReturnUnroutableMandatoryMessageTest.class);
     }
 
+    @Override
     public void onException(JMSException jmsException)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
 
b/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
index 25c1a16..1916664 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
@@ -187,6 +187,7 @@ public class FailoverMethodTest extends QpidBrokerTestCase 
implements ExceptionL
             //Create a thread to start the broker asynchronously
             brokerStart = new Thread(new Runnable()
             {
+                @Override
                 public void run()
                 {
                     try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
 
b/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
index 85dfd78..1d3bb53 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
@@ -51,6 +51,7 @@ public class AccessControlLoggingTest extends 
AbstractTestLogging
     private Connection _connection;
     private Session _session;
 
+    @Override
     public void setUp() throws Exception
     {
         // Write out ACL for this test

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
 
b/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
index ff99e16..aaad678 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
@@ -53,6 +53,7 @@ public class DurableQueueLoggingTest extends 
AbstractTestLogging
     private static final String QUEUE_PREFIX = "QUE-";
     private static int PRIORITIES = 6;
 
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
 
b/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
index 29f74c5..0771c37 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging;
 
 public class TransientQueueLoggingTest extends DurableQueueLoggingTest
 {
+    @Override
     public void setUp() throws Exception
     {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java
----------------------------------------------------------------------
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java 
b/systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java
index 29f60c7..81fdb23 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java
@@ -44,6 +44,7 @@ public class ConsumerPriorityTest extends QpidBrokerTestCase
     private Connection _producingConnection;
     private Session _producingSession;
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();


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

Reply via email to