http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
index 0a1a2b4..95f7da6 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
@@ -38,6 +38,7 @@ public class ConstantExpression<T> implements Expression<T>
             super(value);
         }
 
+        @Override
         public boolean matches(E message)
         {
             Object object = evaluate(message);
@@ -134,6 +135,7 @@ public class ConstantExpression<T> implements Expression<T>
         this._value = value;
     }
 
+    @Override
     public Object evaluate(T message)
     {
         return _value;
@@ -147,6 +149,7 @@ public class ConstantExpression<T> implements Expression<T>
     /**
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         if (_value == null)
@@ -172,6 +175,7 @@ public class ConstantExpression<T> implements Expression<T>
      *
      * @see java.lang.Object#hashCode()
      */
+    @Override
     public int hashCode()
     {
         return toString().hashCode();
@@ -182,6 +186,7 @@ public class ConstantExpression<T> implements Expression<T>
      *
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @Override
     public boolean equals(Object o)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
index 9b5dc93..873eb35 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
@@ -130,6 +130,7 @@ public class FilterSupport
             return AMQPFilterTypes.NO_LOCAL.toString();
         }
 
+        @Override
         public boolean matches(Filterable message)
         {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
index 892b7b9..a15bdc1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
@@ -29,8 +29,10 @@ public interface Filterable extends FilterableMessage
 {
     AMQMessageHeader getMessageHeader();
 
+    @Override
     boolean isPersistent();
 
+    @Override
     boolean isRedelivered();
 
     Object getConnectionReference();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
index 953c5e6..9fcf645 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
@@ -55,6 +55,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
     {
         JMS_PROPERTY_EXPRESSIONS.put("JMSDestination", new 
Expression<FilterableMessage>()
                                      {
+                                         @Override
                                          public Object 
evaluate(FilterableMessage message)
                                          {
                                              //TODO
@@ -81,6 +82,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
         JMS_PROPERTY_EXPRESSIONS.put("JMSRedelivered", new 
Expression<FilterableMessage>()
                                      {
+                                         @Override
                                          public Object 
evaluate(FilterableMessage message)
                                          {
                                              return message.isRedelivered();
@@ -103,6 +105,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
         jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
     }
 
+    @Override
     public Object evaluate(FilterableMessage message)
     {
 
@@ -124,6 +127,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
     /**
      * @see Object#toString()
      */
+    @Override
     public String toString()
     {
         return name;
@@ -132,6 +136,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
     /**
      * @see Object#hashCode()
      */
+    @Override
     public int hashCode()
     {
         return name.hashCode();
@@ -140,6 +145,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
     /**
      * @see Object#equals(Object)
      */
+    @Override
     public boolean equals(Object o)
     {
 
@@ -154,6 +160,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class ReplyToExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
             String replyTo = message.getReplyTo();
@@ -164,6 +171,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class TypeExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
 
@@ -175,6 +183,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class DeliveryModeExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
                 JMSDeliveryMode mode = message.isPersistent() ? 
JMSDeliveryMode.PERSISTENT :
@@ -190,6 +199,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class PriorityExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
             byte priority = message.getPriority();
@@ -199,6 +209,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class MessageIDExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
 
@@ -211,6 +222,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class TimestampExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
             long timestamp = message.getTimestamp();
@@ -220,6 +232,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class CorrelationIdExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
 
@@ -231,6 +244,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression<Filterab
 
     private static class ExpirationExpression implements 
Expression<FilterableMessage>
     {
+        @Override
         public Object evaluate(FilterableMessage message)
         {
             long expiration = message.getExpiration();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index 9baecdc..4094a42 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
@@ -51,6 +51,7 @@ public class JMSSelectorFilter implements MessageFilter
         return AMQPFilterTypes.JMS_SELECTOR.toString();
     }
 
+    @Override
     public boolean matches(Filterable message)
     {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
index 8c4d9e8..f6b56e3 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
@@ -30,6 +30,7 @@ import org.apache.qpid.server.plugin.PluggableService;
 @PluggableService
 public final class JMSSelectorFilterFactory implements MessageFilterFactory
 {
+    @Override
     public String getType()
     {
         return AMQPFilterTypes.JMS_SELECTOR.toString();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
index 95c4171..cea358b 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
@@ -41,8 +41,10 @@ public abstract class LogicExpression<T> extends 
BinaryExpression<T> implements
         super(left, right);
     }
 
+    @Override
     public abstract Object evaluate(T message);
 
+    @Override
     public boolean matches(T message)
     {
         Object object = evaluate(message);
@@ -57,6 +59,7 @@ public abstract class LogicExpression<T> extends 
BinaryExpression<T> implements
             super(lvalue, rvalue);
         }
 
+        @Override
         public Object evaluate(E message)
         {
 
@@ -72,6 +75,7 @@ public abstract class LogicExpression<T> extends 
BinaryExpression<T> implements
             return (rv == null) ? null : rv;
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             return "OR";
@@ -85,6 +89,7 @@ public abstract class LogicExpression<T> extends 
BinaryExpression<T> implements
             super(lvalue, rvalue);
         }
 
+        @Override
         public Object evaluate(E message)
         {
 
@@ -106,6 +111,7 @@ public abstract class LogicExpression<T> extends 
BinaryExpression<T> implements
             return (rv == null) ? null : rv;
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             return "AND";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
index 8e8cfbd..e9c1974 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
@@ -75,6 +75,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             super(left);
         }
 
+        @Override
         public boolean matches(E message)
         {
             Object object = evaluate(message);
@@ -147,6 +148,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
     /**
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "(" + getExpressionSymbol() + " " + right.toString() + ")";
@@ -157,6 +159,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
      *
      * @see java.lang.Object#hashCode()
      */
+    @Override
     public int hashCode()
     {
         return toString().hashCode();
@@ -167,6 +170,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
      *
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @Override
     public boolean equals(Object o)
     {
         return ((o != null) && this.getClass().equals(o.getClass())) && 
toString().equals(o.toString());
@@ -187,6 +191,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             super(left);
         }
 
+        @Override
         public Object evaluate(E message)
         {
             Object rvalue = getRight().evaluate(message);
@@ -203,6 +208,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             return null;
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             return "-";
@@ -226,6 +232,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             _allowNonJms = allowNonJms;
         }
 
+        @Override
         public Object evaluate(E expression)
         {
 
@@ -316,6 +323,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             return answer.toString();
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             if (_not)
@@ -336,6 +344,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             super(left);
         }
 
+        @Override
         public Object evaluate(E message)
         {
             Boolean lvalue = (Boolean) getRight().evaluate(message);
@@ -347,6 +356,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             return lvalue ? Boolean.FALSE : Boolean.TRUE;
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             return "NOT";
@@ -360,6 +370,7 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             super(left);
         }
 
+        @Override
         public Object evaluate(E message)
         {
             Object rvalue = getRight().evaluate(message);
@@ -376,11 +387,13 @@ public abstract class UnaryExpression<T> implements 
Expression<T>
             return ((Boolean) rvalue) ? Boolean.TRUE : Boolean.FALSE;
         }
 
+        @Override
         public String toString()
         {
             return getRight().toString();
         }
 
+        @Override
         public String getExpressionSymbol()
         {
             return "";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
index 0daf08c..581cfd3 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/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-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
index afb6b92..e26f37f 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/selector/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-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
index 846a617..597fd6e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
@@ -60,16 +60,19 @@ public abstract class AbstractMessageLogger implements 
MessageLogger
         _enabled = statusUpdatesEnabled;
     }
     
+    @Override
     public boolean isEnabled()
     {
         return _enabled;
     }
 
+    @Override
     public boolean isMessageEnabled(String logHierarchy)
     {
         return _enabled;
     }
 
+    @Override
     public void message(LogMessage message)
     {
         if (isMessageEnabled(message.getLogHierarchy()))
@@ -78,6 +81,7 @@ public abstract class AbstractMessageLogger implements 
MessageLogger
         }
     }
 
+    @Override
     public void message(LogSubject subject, LogMessage message)
     {
         if (isMessageEnabled(message.getLogHierarchy()))

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/NullMessageLogger.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/NullMessageLogger.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/NullMessageLogger.java
index 8db58d0..9671821 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/NullMessageLogger.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/NullMessageLogger.java
@@ -29,11 +29,13 @@ public class NullMessageLogger extends AbstractMessageLogger
         return false;
     }
 
+    @Override
     public void rawMessage(String message, String logHierarchy)
     {
         // drop message
     }
 
+    @Override
     public void rawMessage(String message, Throwable throwable, String 
logHierarchy)
     {
         // drop message

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
index 9bf7e21..256d3a6 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
@@ -30,11 +30,13 @@ public class SystemOutMessageLogger extends 
AbstractMessageLogger
         return true;
     }
 
+    @Override
     public void rawMessage(String message, String logHierarchy)
     {
         rawMessage(message, null, logHierarchy);
     }
 
+    @Override
     public void rawMessage(String message, Throwable throwable, String 
logHierarchy)
     {
         System.out.println(message);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
index 8638958..eb8f2b3 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
@@ -107,11 +107,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return ALLOWED_LOG_HIERARCHY;
@@ -165,11 +167,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DENIED_LOG_HIERARCHY;
@@ -223,11 +227,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETE_LOG_HIERARCHY;
@@ -281,11 +287,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -339,11 +347,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -392,11 +402,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -450,11 +462,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return LOADED_LOG_HIERARCHY;
@@ -503,11 +517,13 @@ public class AccessControlMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
index b58a7e1..a80f242 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
@@ -103,11 +103,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETE_LOG_HIERARCHY;
@@ -161,11 +163,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -219,11 +223,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -300,11 +306,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return AUTHENTICATION_FAILED_LOG_HIERARCHY;
@@ -353,11 +361,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -406,11 +416,13 @@ public class AuthenticationProviderMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
index 01909ba..2e7128d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
@@ -97,11 +97,13 @@ public class BindingMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -155,11 +157,13 @@ public class BindingMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETED_LOG_HIERARCHY;
@@ -213,11 +217,13 @@ public class BindingMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
index 2d81af6..aa9773e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
@@ -116,11 +116,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return READY_LOG_HIERARCHY;
@@ -174,11 +176,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FAILED_CHILDREN_LOG_HIERARCHY;
@@ -232,11 +236,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return LISTENING_LOG_HIERARCHY;
@@ -290,11 +296,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STARTUP_LOG_HIERARCHY;
@@ -348,11 +356,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return MANAGEMENT_MODE_LOG_HIERARCHY;
@@ -406,11 +416,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STATS_MSGS_LOG_HIERARCHY;
@@ -464,11 +476,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return PLATFORM_LOG_HIERARCHY;
@@ -522,11 +536,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CONFIG_LOG_HIERARCHY;
@@ -580,11 +596,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return SHUTTING_DOWN_LOG_HIERARCHY;
@@ -638,11 +656,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STATS_DATA_LOG_HIERARCHY;
@@ -696,11 +716,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FATAL_ERROR_LOG_HIERARCHY;
@@ -754,11 +776,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -807,11 +831,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STOPPED_LOG_HIERARCHY;
@@ -865,11 +891,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return PROCESS_LOG_HIERARCHY;
@@ -923,11 +951,13 @@ public class BrokerMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return MAX_MEMORY_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
index 3c41e95..4815015 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
@@ -114,11 +114,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -167,11 +169,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FLOW_CONTROL_IGNORED_LOG_HIERARCHY;
@@ -220,11 +224,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -278,11 +284,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DISCARDMSG_NOROUTE_LOG_HIERARCHY;
@@ -336,11 +344,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DEADLETTERMSG_LOG_HIERARCHY;
@@ -394,11 +404,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FLOW_LOG_HIERARCHY;
@@ -452,11 +464,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return PREFETCH_SIZE_LOG_HIERARCHY;
@@ -510,11 +524,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_TXN_LOG_HIERARCHY;
@@ -568,11 +584,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_FORCED_LOG_HIERARCHY;
@@ -626,11 +644,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -684,11 +704,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return IDLE_TXN_LOG_HIERARCHY;
@@ -742,11 +764,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FLOW_ENFORCED_LOG_HIERARCHY;
@@ -795,11 +819,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FLOW_REMOVED_LOG_HIERARCHY;
@@ -853,11 +879,13 @@ public class ChannelMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DISCARDMSG_NOALTEXCH_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
index 91aed4a..ece4439 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
@@ -96,11 +96,13 @@ public class ConfigStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_START_LOG_HIERARCHY;
@@ -149,11 +151,13 @@ public class ConfigStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -207,11 +211,13 @@ public class ConfigStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STORE_LOCATION_LOG_HIERARCHY;
@@ -260,11 +266,13 @@ public class ConfigStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -313,11 +321,13 @@ public class ConfigStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_COMPLETE_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
index b1d4c39..337a388 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
@@ -109,11 +109,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -167,11 +169,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLIENT_VERSION_LOG_LOG_HIERARCHY;
@@ -225,11 +229,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLIENT_VERSION_REJECT_LOG_HIERARCHY;
@@ -278,11 +284,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DROPPED_CONNECTION_LOG_HIERARCHY;
@@ -331,11 +339,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return MODEL_DELETE_LOG_HIERARCHY;
@@ -412,11 +422,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return IDLE_CLOSE_LOG_HIERARCHY;
@@ -465,11 +477,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -523,11 +537,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return LARGE_TRANSACTION_WARN_LOG_HIERARCHY;
@@ -634,11 +650,13 @@ public class ConnectionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
index 125490c..4cd7627 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
@@ -122,11 +122,13 @@ public class ExchangeMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -175,11 +177,13 @@ public class ExchangeMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETED_LOG_HIERARCHY;
@@ -233,11 +237,13 @@ public class ExchangeMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DISCARDMSG_LOG_HIERARCHY;
@@ -291,11 +297,13 @@ public class ExchangeMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
index 7b9e156..4674797 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
@@ -119,11 +119,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return LEFT_LOG_HIERARCHY;
@@ -177,11 +179,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return PRIORITY_CHANGED_LOG_HIERARCHY;
@@ -235,11 +239,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return ROLE_CHANGED_LOG_HIERARCHY;
@@ -293,11 +299,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return JOINED_LOG_HIERARCHY;
@@ -346,11 +354,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return NODE_ROLLEDBACK_LOG_HIERARCHY;
@@ -399,11 +409,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETED_LOG_HIERARCHY;
@@ -457,11 +469,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return INTRUDER_DETECTED_LOG_HIERARCHY;
@@ -515,11 +529,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY;
@@ -573,11 +589,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY;
@@ -626,11 +644,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -684,11 +704,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return ADDED_LOG_HIERARCHY;
@@ -737,11 +759,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return QUORUM_LOST_LOG_HIERARCHY;
@@ -795,11 +819,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return TRANSFER_MASTER_LOG_HIERARCHY;
@@ -853,11 +879,13 @@ public class HighAvailabilityMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return REMOVED_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
index 2700528..b73c53f 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
@@ -103,11 +103,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETE_LOG_HIERARCHY;
@@ -161,11 +163,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -219,11 +223,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -277,11 +283,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return EXPIRING_LOG_HIERARCHY;
@@ -330,11 +338,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -383,11 +393,13 @@ public class KeyStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index 7d13111..e02c74d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
@@ -105,11 +105,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return READY_LOG_HIERARCHY;
@@ -163,11 +165,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return SHUTTING_DOWN_LOG_HIERARCHY;
@@ -221,11 +225,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STOPPED_LOG_HIERARCHY;
@@ -279,11 +285,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return LISTENING_LOG_HIERARCHY;
@@ -337,11 +345,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STARTUP_LOG_HIERARCHY;
@@ -395,11 +405,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -453,11 +465,13 @@ public class ManagementConsoleMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
index 14e5646..e6a9483 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
@@ -102,11 +102,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_START_LOG_HIERARCHY;
@@ -155,11 +157,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -213,11 +217,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STORE_LOCATION_LOG_HIERARCHY;
@@ -266,11 +272,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_COMPLETE_LOG_HIERARCHY;
@@ -319,11 +327,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OVERFULL_LOG_HIERARCHY;
@@ -372,11 +382,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSED_LOG_HIERARCHY;
@@ -425,11 +437,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return UNDERFULL_LOG_HIERARCHY;
@@ -483,11 +497,13 @@ public class MessageStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERED_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
index fc77cee..e31f251 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
@@ -111,11 +111,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETE_LOG_HIERARCHY;
@@ -169,11 +171,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -227,11 +231,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY;
@@ -285,11 +291,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CONNECTION_REJECTED_CLOSED_LOG_HIERARCHY;
@@ -343,11 +351,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
@@ -401,11 +411,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -459,11 +471,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return BIND_FAILED_LOG_HIERARCHY;
@@ -512,11 +526,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -570,11 +586,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY;
@@ -623,11 +641,13 @@ public class PortMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
index 5df5b21..6488b80 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
@@ -166,11 +166,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -224,11 +226,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DROPPED_LOG_HIERARCHY;
@@ -282,11 +286,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OVERFULL_LOG_HIERARCHY;
@@ -340,11 +346,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -398,11 +406,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return UNDERFULL_LOG_HIERARCHY;
@@ -456,11 +466,13 @@ public class QueueMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETED_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
index 27ac6c2..d314d81 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
@@ -99,11 +99,13 @@ public class SubscriptionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STATE_LOG_HIERARCHY;
@@ -152,11 +154,13 @@ public class SubscriptionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -243,11 +247,13 @@ public class SubscriptionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -301,11 +307,13 @@ public class SubscriptionMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
index 12dff42..f2ff590 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
@@ -130,11 +130,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_START_LOG_HIERARCHY;
@@ -188,11 +190,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY;
@@ -241,11 +245,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -299,11 +305,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STORE_LOCATION_LOG_HIERARCHY;
@@ -380,11 +388,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERY_COMPLETE_LOG_HIERARCHY;
@@ -433,11 +443,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSED_LOG_HIERARCHY;
@@ -491,11 +503,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return XA_INCOMPLETE_QUEUE_LOG_HIERARCHY;
@@ -549,11 +563,13 @@ public class TransactionLogMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return RECOVERED_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
index 9f86076..2c0600c 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
@@ -101,11 +101,13 @@ public class TrustStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return DELETE_LOG_HIERARCHY;
@@ -154,11 +156,13 @@ public class TrustStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSE_LOG_HIERARCHY;
@@ -212,11 +216,13 @@ public class TrustStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATE_LOG_HIERARCHY;
@@ -270,11 +276,13 @@ public class TrustStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -323,11 +331,13 @@ public class TrustStoreMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPEN_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
index f0d08d7..39761d8 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
@@ -107,11 +107,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CREATED_LOG_HIERARCHY;
@@ -165,11 +167,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STATS_DATA_LOG_HIERARCHY;
@@ -223,11 +227,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return ERRORED_LOG_HIERARCHY;
@@ -281,11 +287,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return CLOSED_LOG_HIERARCHY;
@@ -339,11 +347,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return OPERATION_LOG_HIERARCHY;
@@ -397,11 +407,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FILESYSTEM_FULL_LOG_HIERARCHY;
@@ -455,11 +467,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return FILESYSTEM_NOTFULL_LOG_HIERARCHY;
@@ -513,11 +527,13 @@ public class VirtualHostMessages
 
         return new LogMessage()
         {
+            @Override
             public String toString()
             {
                 return message;
             }
 
+            @Override
             public String getLogHierarchy()
             {
                 return STATS_MSGS_LOG_HIERARCHY;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
index 6cf1664..35e6b42 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
@@ -52,6 +52,7 @@ public abstract class AbstractLogSubject implements LogSubject
      *
      * @return String representing this LogSubject
      */
+    @Override
     public String toLogString()
     {
         return _logString;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
 
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
index 5a49e62..8f2edf3 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
@@ -99,6 +99,7 @@ public class ConnectionLogSubject extends AbstractLogSubject
         }
     }
 
+    @Override
     public String toLogString()
     {
         updateLogString();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
index 32fb369..b4ae71c 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
@@ -68,6 +68,7 @@ public abstract class AbstractServerMessageImpl<X extends 
AbstractServerMessageI
         return _handle.getContentSize() + _handle.getMetadataSize();
     }
 
+    @Override
     public StoredMessage<T> getStoredMessage()
     {
         return _handle;
@@ -192,11 +193,13 @@ public abstract class AbstractServerMessageImpl<X extends 
AbstractServerMessageI
         }
     }
 
+    @Override
     final public Object getConnectionReference()
     {
         return _connectionReference;
     }
 
+    @Override
     public String toString()
     {
         return "Message[" + debugIdentity() + "]";
@@ -258,11 +261,13 @@ public abstract class AbstractServerMessageImpl<X extends 
AbstractServerMessageI
 
         }
 
+        @Override
         public X getMessage()
         {
             return (X) _message;
         }
 
+        @Override
         public synchronized void release()
         {
             if(_releasedUpdater.compareAndSet(this,0,1))

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
index 6030f87..30d6499 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
@@ -32,6 +32,7 @@ import org.apache.qpid.server.store.StorableMessageMetaData;
 public interface MessageDestination extends MessageNode
 {
 
+    @Override
     String getName();
 
     NamedAddressSpace getAddressSpace();
@@ -43,7 +44,7 @@ public interface MessageDestination extends MessageNode
      *
      *
      * @param message the message to be routed
-     * @param routingAddress
+     * @param routingAddress the routing address
      * @param instanceProperties the instance properties
     */
     <M extends ServerMessage<? extends StorableMessageMetaData>> 
RoutingResult<M> route(M message,

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
index 17652a9..081c96d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
@@ -114,11 +114,13 @@ public interface MessageInstance
     final class AvailableState extends EntryState
     {
 
+        @Override
         public State getState()
         {
             return State.AVAILABLE;
         }
 
+        @Override
         public String toString()
         {
             return getState().name();
@@ -129,11 +131,13 @@ public interface MessageInstance
     final class DequeuedState extends EntryState
     {
 
+        @Override
         public State getState()
         {
             return State.DEQUEUED;
         }
 
+        @Override
         public String toString()
         {
             return getState().name();
@@ -144,11 +148,13 @@ public interface MessageInstance
     final class DeletedState extends EntryState
     {
 
+        @Override
         public State getState()
         {
             return State.DELETED;
         }
 
+        @Override
         public String toString()
         {
             return getState().name();
@@ -157,11 +163,13 @@ public interface MessageInstance
 
     final class NonConsumerAcquiredState extends EntryState
     {
+        @Override
         public State getState()
         {
             return State.ACQUIRED;
         }
 
+        @Override
         public String toString()
         {
             return getState().name();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
index dfe5d64..240b8b0 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
@@ -24,5 +24,6 @@ public interface MessageReference<M extends ServerMessage> 
extends AutoCloseable
 {
     M getMessage();
     void release();
+    @Override
     void close();
 }


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

Reply via email to