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

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

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
index 55c63e6..bb18bcc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
@@ -108,6 +108,7 @@ public class RoutingResult<M extends ServerMessage<? extends StorableMessageMeta
         {
             MessageReference _reference = _message.newReference();
 
+            @Override
             public void postCommit(MessageEnqueueRecord... records)
             {
                 try
@@ -123,6 +124,7 @@ public class RoutingResult<M extends ServerMessage<? extends StorableMessageMeta
                 }
             }
 
+            @Override
             public void onRollback()
             {
                 _reference.release();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java b/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
index d648b63..dcd307d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
@@ -32,10 +32,13 @@ public interface ServerMessage<T extends StorableMessageMetaData> extends Enqueu
 
     AMQMessageHeader getMessageHeader();
 
+    @Override
     StoredMessage<T> getStoredMessage();
 
+    @Override
     boolean isPersistent();
 
+    @Override
     long getSize();
 
     long getSizeIncludingHeader();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 1e75b20..8856be0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -569,6 +569,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     }
 
 
+    @Override
     public final ListenableFuture<Void> openAsync()
     {
         return doOnConfigThread(new Task<ListenableFuture<Void>, RuntimeException>()
@@ -1607,16 +1608,19 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     {
     }
 
+    @Override
     public final UUID getId()
     {
         return _id;
     }
 
+    @Override
     public final String getName()
     {
         return _name;
     }
 
+    @Override
     public final boolean isDurable()
     {
         return _durable;
@@ -1652,11 +1656,13 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         return _managesChildStorage;
     }
 
+    @Override
     public Map<String,String> getContext()
     {
         return _context == null ? Collections.<String,String>emptyMap() : Collections.unmodifiableMap(_context);
     }
 
+    @Override
     public State getDesiredState()
     {
         return _desiredState;
@@ -1801,6 +1807,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         }
     }
 
+    @Override
     public void addChangeListener(final ConfigurationChangeListener listener)
     {
         if(listener == null)
@@ -1816,6 +1823,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         }
     }
 
+    @Override
     public boolean removeChangeListener(final ConfigurationChangeListener listener)
     {
         if(listener == null)
@@ -1963,6 +1971,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         return getModel().getAncestor(clazz, this);
     }
 
+    @Override
     public final Collection<String> getAttributeNames()
     {
         return getTypeRegistry().getAttributeNames(getClass());
@@ -1974,6 +1983,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         return getCategoryClass().getSimpleName() + "[id=" + _id + ", name=" + getName() + ", type=" + getType() + "]";
     }
 
+    @Override
     public final ConfiguredObjectRecord asObjectRecord()
     {
         return new ConfiguredObjectRecord()
@@ -2165,6 +2175,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         doSync(setDesiredState(State.STOPPED));
     }
 
+    @Override
     public final void delete()
     {
         doSync(deleteAsync());
@@ -2236,6 +2247,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         }
     }
 
+    @Override
     public final ListenableFuture<Void> deleteAsync()
     {
         return setDesiredState(State.DELETED);
@@ -3019,6 +3031,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         return AccessController.doPrivileged
                 (new PrivilegedAction<AccessControlContext>()
                 {
+                    @Override
                     public AccessControlContext run()
                     {
                         return new AccessControlContext
@@ -3162,6 +3175,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     }
 
 
+    @Override
     public <Y extends ConfiguredObject<Y>> Y findConfiguredObject(Class<Y> clazz, String name)
     {
         Collection<Y> reachable = getModel().getReachableObjects(this, clazz);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
index 9faf4ee..86e6288 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
@@ -271,11 +271,13 @@ public abstract class AbstractContainer<X extends AbstractContainer<X>> extends
         return BrokerModel.MODEL_VERSION;
     }
 
+    @Override
     public EventLogger getEventLogger()
     {
         return _eventLogger;
     }
 
+    @Override
     public void setEventLogger(final EventLogger eventLogger)
     {
         _eventLogger = eventLogger;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
index 8da00a9..ca174f0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
@@ -547,11 +547,13 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
         return preferenceStoreFactory.createInstance(this, attributes);
     }
 
+    @Override
     protected final Principal getSystemPrincipal()
     {
         return _systemPrincipal;
     }
 
+    @Override
     public Runnable getOnContainerResolveTask()
     {
         return _onContainerResolveTask;
@@ -563,11 +565,13 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
         _onContainerResolveTask = onContainerResolveTask;
     }
 
+    @Override
     public Runnable getOnContainerCloseTask()
     {
         return _onContainerCloseTask;
     }
 
+    @Override
     public void setOnContainerCloseTask(final Runnable onContainerCloseTask)
     {
         _onContainerCloseTask = onContainerCloseTask;
@@ -596,6 +600,7 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
 
     private class ShutdownService implements Runnable
     {
+        @Override
         public void run()
         {
             Subject.doAs(getSystemTaskSubject("Shutdown"),

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
index c468368..0549dd0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractUnresolvedObject.java
@@ -139,6 +139,7 @@ public abstract class AbstractUnresolvedObject<C extends ConfiguredObject<C>> im
         return _record;
     }
 
+    @Override
     public ConfiguredObject<?> getParent()
     {
         return _parent;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
index 6b235a3..c29009c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.model;
 @ManagedObject
 public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>, CommonAccessControlProvider<AccessControlProvider<?>>
 {
+    @Override
     @ManagedAttribute(defaultValue = "10", description = "The priority of this access control provider - the lower the number the higher the priority")
     int getPriority();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index d9cd370..5749b74 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -310,6 +310,7 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
     void purgeUser(@Param(name="origin", description="The AuthenticationProvider the username is associated with")AuthenticationProvider<?> origin,
                    @Param(name="username", description="The unqualified username that should be purged from the broker", mandatory = true)String username);
 
+    @Override
     @ManagedOperation(description = "Resets statistics on this object and all child objects", changesConfiguredObjectState = false, nonModifying = true)
     void resetStatistics();
 
@@ -336,16 +337,20 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
 
     boolean isManagementMode();
 
+    @Override
     EventLogger getEventLogger();
 
+    @Override
     void setEventLogger(EventLogger eventLogger);
 
     boolean isVirtualHostPropertiesNodeEnabled();
 
+    @Override
     AuthenticationProvider<?> getManagementModeAuthenticationProvider();
 
     void assignTargetSizes();
 
+    @Override
     int getNetworkBufferSize();
 
     ScheduledFuture<?> scheduleHouseKeepingTask(long period, final TimeUnit unit, Runnable task);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 788f0b9..565cc05 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -525,12 +525,14 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         return children;
     }
 
+    @Override
     public Collection<Port<?>> getPorts()
     {
         Collection children = getChildren(Port.class);
         return children;
     }
 
+    @Override
     public Collection<AuthenticationProvider<?>> getAuthenticationProviders()
     {
         Collection children = getChildren(AuthenticationProvider.class);
@@ -778,6 +780,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         }
     }
 
+    @Override
     public AccessControl getAccessControl()
     {
         return _accessControl;
@@ -852,12 +855,14 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         getEventLogger().message(BrokerMessages.OPERATION(operation));
     }
 
+    @Override
     public void registerMessageDelivered(long messageSize)
     {
         _messagesDelivered.registerEvent(1L);
         _dataDelivered.registerEvent(messageSize);
     }
 
+    @Override
     public void registerMessageReceived(long messageSize, long timestamp)
     {
         _messagesReceived.registerEvent(1L, timestamp);
@@ -882,21 +887,25 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         return QpidByteBuffer.getNumberOfPooledBuffers();
     }
 
+    @Override
     public StatisticsCounter getMessageReceiptStatistics()
     {
         return _messagesReceived;
     }
 
+    @Override
     public StatisticsCounter getDataReceiptStatistics()
     {
         return _dataReceived;
     }
 
+    @Override
     public StatisticsCounter getMessageDeliveryStatistics()
     {
         return _messagesDelivered;
     }
 
+    @Override
     public StatisticsCounter getDataDeliveryStatistics()
     {
         return _dataDelivered;
@@ -936,6 +945,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
             _subject = getSystemTaskSubject("Statistics");
         }
 
+        @Override
         public void run()
         {
             Subject.doAs(_subject, new PrivilegedAction<Object>()
@@ -1010,6 +1020,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         return _virtualHostPropertiesNodeEnabled;
     }
 
+    @Override
     public AuthenticationProvider<?> getManagementModeAuthenticationProvider()
     {
         return _managementModeAuthenticationProvider;
@@ -1021,6 +1032,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
         return _networkBufferSize;
     }
 
+    @Override
     public String getDocumentationUrl()
     {
         return _documentationUrl;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
index 92bffb5..a2a0464 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
@@ -120,6 +120,7 @@ public final class BrokerModel extends Model
                                                          _objectFactory);
     }
 
+    @Override
     public final ConfiguredObjectTypeRegistry getTypeRegistry()
     {
         return _typeRegistry;
@@ -161,6 +162,7 @@ public final class BrokerModel extends Model
         return _objectFactory;
     }
 
+    @Override
     public Collection<Class<? extends ConfiguredObject>> getChildTypes(Class<? extends ConfiguredObject> parent)
     {
         Collection<Class<? extends ConfiguredObject>> childTypes = _children.get(parent);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
index 4f241d8..a5b3598 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
@@ -119,11 +119,13 @@ public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T>  extend
         return null;
     }
 
+    @Override
     public boolean isAutomated()
     {
         return true;
     }
 
+    @Override
     public boolean isDerived()
     {
         return false;
@@ -135,6 +137,7 @@ public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T>  extend
         return _annotation.defaultValue();
     }
 
+    @Override
     public boolean isSecure()
     {
         return _annotation.secure();
@@ -152,6 +155,7 @@ public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T>  extend
         return _annotation.immutable();
     }
 
+    @Override
     public boolean isPersisted()
     {
         return _annotation.persist();
@@ -181,11 +185,13 @@ public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T>  extend
         return _annotation.initialization();
     }
 
+    @Override
     public String getDescription()
     {
         return _annotation.description();
     }
 
+    @Override
     public Pattern getSecureValueFilter()
     {
         return _secureValuePattern;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedInjectedAttribute.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedInjectedAttribute.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedInjectedAttribute.java
index 05932cb..ff88d7e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedInjectedAttribute.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedInjectedAttribute.java
@@ -106,16 +106,19 @@ public class ConfiguredDerivedInjectedAttribute<C extends ConfiguredObject, T>
         return false;
     }
 
+    @Override
     public boolean isDerived()
     {
         return true;
     }
 
+    @Override
     public boolean isSecure()
     {
         return _secure;
     }
 
+    @Override
     public boolean isPersisted()
     {
         return _persisted;
@@ -139,11 +142,13 @@ public class ConfiguredDerivedInjectedAttribute<C extends ConfiguredObject, T>
         return _oversizedAltText;
     }
 
+    @Override
     public String getDescription()
     {
         return _description;
     }
 
+    @Override
     public Pattern getSecureValueFilter()
     {
         return _secureValuePattern;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedMethodAttribute.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedMethodAttribute.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedMethodAttribute.java
index 72065b1..2e9270b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedMethodAttribute.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredDerivedMethodAttribute.java
@@ -46,21 +46,25 @@ public class ConfiguredDerivedMethodAttribute<C extends ConfiguredObject, T>  ex
         }
     }
 
+    @Override
     public boolean isAutomated()
     {
         return false;
     }
 
+    @Override
     public boolean isDerived()
     {
         return true;
     }
 
+    @Override
     public boolean isSecure()
     {
         return _annotation.secure();
     }
 
+    @Override
     public boolean isPersisted()
     {
         return _annotation.persist();
@@ -85,6 +89,7 @@ public class ConfiguredDerivedMethodAttribute<C extends ConfiguredObject, T>  ex
     }
 
 
+    @Override
     public String getDescription()
     {
         return _annotation.description();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
index 8cda227..3dc294b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
@@ -78,6 +78,7 @@ public interface ConfiguredObject<X extends ConfiguredObject<X>> extends Context
      *
      * @return the name of the object
      */
+    @Override
     @ManagedAttribute( mandatory = true )
     String getName();
 
@@ -244,6 +245,7 @@ public interface ConfiguredObject<X extends ConfiguredObject<X>> extends Context
     ListenableFuture<Void> setAttributesAsync(Map<String, Object> attributes) throws IllegalStateException, AccessControlException, IllegalArgumentException;
 
 
+    @Override
     Class<? extends ConfiguredObject> getCategoryClass();
     Class<? extends ConfiguredObject> getTypeClass();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedStatistic.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedStatistic.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedStatistic.java
index 89ca552..95c8507 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedStatistic.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedStatistic.java
@@ -83,6 +83,7 @@ final public class ConfiguredObjectInjectedStatistic<C extends ConfiguredObject,
 
     }
 
+    @Override
     public String getDescription()
     {
         return _description;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
index 00d6934..0361b02 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
@@ -148,16 +148,19 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
         return null;
     }
 
+    @Override
     public boolean isAutomated()
     {
         return false;
     }
 
+    @Override
     public boolean isDerived()
     {
         return false;
     }
 
+    @Override
     public String defaultValue()
     {
         return _defaultValue;
@@ -169,21 +172,25 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
         return _initialization;
     }
 
+    @Override
     public boolean isSecure()
     {
         return _secure;
     }
 
+    @Override
     public boolean isMandatory()
     {
         return false;
     }
 
+    @Override
     public boolean isImmutable()
     {
         return _immutable;
     }
 
+    @Override
     public boolean isPersisted()
     {
         return _persisted;
@@ -207,11 +214,13 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
         return _oversizedAltText;
     }
 
+    @Override
     public String getDescription()
     {
         return _description;
     }
 
+    @Override
     public Pattern getSecureValueFilter()
     {
         return _secureValuePattern;
@@ -225,6 +234,7 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
                ((filter = getSecureValueFilter()) == null || filter.matcher(String.valueOf(value)).matches());
     }
 
+    @Override
     public Collection<String> validValues()
     {
         if(_validValuesMethod != null)
@@ -256,6 +266,7 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
     }
 
     /** Returns true iff this attribute has valid values defined */
+    @Override
     public boolean hasValidValues()
     {
         return validValues() != null && validValues().size() > 0;
@@ -272,6 +283,7 @@ public class ConfiguredSettableInjectedAttribute<C extends ConfiguredObject, T>
         return convert(value, configuredObject);
     }
 
+    @Override
     public final T convert(final Object value, final C object)
     {
         final AttributeValueConverter<T> converter = getConverter();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/DefaultVirtualHostAlias.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/DefaultVirtualHostAlias.java b/broker-core/src/main/java/org/apache/qpid/server/model/DefaultVirtualHostAlias.java
index 5265cf4..0bf2ab8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/DefaultVirtualHostAlias.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/DefaultVirtualHostAlias.java
@@ -26,6 +26,7 @@ public interface DefaultVirtualHostAlias<X extends VirtualHostAlias<X>> extends
 
     String TYPE_NAME = "defaultAlias";
 
+    @Override
     @ManagedAttribute( defaultValue = "500" )
     int getPriority();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/HostNameAlias.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/HostNameAlias.java b/broker-core/src/main/java/org/apache/qpid/server/model/HostNameAlias.java
index 1206c0e..b6abeeb 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/HostNameAlias.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/HostNameAlias.java
@@ -26,6 +26,7 @@ public interface HostNameAlias<X extends HostNameAlias<X>> extends FixedVirtualH
 
     String TYPE_NAME = "hostnameAlias";
 
+    @Override
     @ManagedAttribute( defaultValue = "750" )
     int getPriority();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfig.java b/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfig.java
index 1807c15..a234b0f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfig.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfig.java
@@ -24,6 +24,7 @@ import org.apache.qpid.server.store.FileBasedSettings;
 
 public interface JsonSystemConfig<X extends JsonSystemConfig<X>> extends SystemConfig<X>, FileBasedSettings
 {
+    @Override
     @ManagedAttribute( defaultValue = "${qpid.work_dir}${file.separator}config.json")
     public String getStorePath();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
index 27422e5..b9413a8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
@@ -44,11 +44,13 @@ public class JsonSystemConfigImpl extends AbstractSystemConfig<JsonSystemConfigI
         super(taskExecutor, eventLogger, systemPrincipal, attributes);
     }
 
+    @Override
     public String getStorePath()
     {
         return _storePath;
     }
 
+    @Override
     protected JsonFileConfigStore createStoreObject()
     {
         return new JsonFileConfigStore(null);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java b/broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java
index a49862b..7e54c61 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java
@@ -23,6 +23,7 @@ import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
 
 public interface MemorySystemConfig<X extends MemorySystemConfig<X>> extends SystemConfig<X>
 {
+    @Override
     @ManagedAttribute( description = "Configuration for the preference store, e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Noop\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/PatternMatchingAlias.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/PatternMatchingAlias.java b/broker-core/src/main/java/org/apache/qpid/server/model/PatternMatchingAlias.java
index 2e024d6..bc84998 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/PatternMatchingAlias.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/PatternMatchingAlias.java
@@ -28,6 +28,7 @@ public interface PatternMatchingAlias<X extends PatternMatchingAlias<X>> extends
 
     String PATTERN = "pattern";
 
+    @Override
     @ManagedAttribute( defaultValue = "200" )
     int getPriority();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index ae9bdf7..cd84c3f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -219,6 +219,7 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
 
 
 
+    @Override
     @ManagedAttribute( defaultValue = "${queue.defaultMessageDurability}" )
     MessageDurability getMessageDurability();
 
@@ -291,6 +292,7 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
     Collection<PublishingLink> getPublishingLinks();
 
 
+    @Override
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
     Collection<QueueConsumer<?,?>> getConsumers();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java b/broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java
index f1552e4..09bc598 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java
@@ -29,6 +29,7 @@ public interface SystemAddressSpaceAlias<X extends SystemAddressSpaceAlias<X>> e
     String PATTERN = "pattern";
     String SYSTEM_ADDRESS_SPACE = "systemAddressSpace";
 
+    @Override
     @ManagedAttribute( defaultValue = "200" )
     int getPriority();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java b/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
index 16b3f5f..84ccc20 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
@@ -104,6 +104,7 @@ public interface SystemConfig<X extends SystemConfig<X>> extends ConfiguredObjec
             defaultValue = "${qpid.broker.defaultPreferenceStoreAttributes}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();
 
+    @Override
     EventLogger getEventLogger();
 
     Container<?> getContainer();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java b/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java
index b5f3e43..5857d87 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java
@@ -51,6 +51,7 @@ public final class SystemConfigBootstrapModel extends Model
                                                          _objectFactory);
     }
 
+    @Override
     public final ConfiguredObjectTypeRegistry getTypeRegistry()
     {
         return _typeRegistry;
@@ -92,6 +93,7 @@ public final class SystemConfigBootstrapModel extends Model
         return _objectFactory;
     }
 
+    @Override
     public Collection<Class<? extends ConfiguredObject>> getChildTypes(Class<? extends ConfiguredObject> parent)
     {
         return Collections.<Class<? extends ConfiguredObject>>emptyList();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
index e43c31f..9dc610e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.model;
 @ManagedObject( amqpName = "org.apache.qpid.VirtualHostAccessControlProvider")
 public interface VirtualHostAccessControlProvider<X extends VirtualHostAccessControlProvider<X>>  extends ConfiguredObject<X>, CommonAccessControlProvider<VirtualHostAccessControlProvider<?>>
 {
+    @Override
     @ManagedAttribute(defaultValue = "10", description = "The priority of this access control provider - the lower the number the higher the priority")
     int getPriority();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index d7aae85..60eeb57 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -75,6 +75,7 @@ public class FileBasedGroupProviderImpl
         _container = container;
     }
 
+    @Override
     public void onValidate()
     {
         Collection<GroupProvider> groupProviders = _container.getChildren(GroupProvider.class);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
index 0ff04a2..e5935e4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
@@ -69,11 +69,13 @@ public class ProtocolVersion  implements Comparable
         return _minorVersion > 90 ? (byte) (_minorVersion % 10) : (byte) 0;
     }
 
+    @Override
     public String toString()
     {
         return _stringFormat;
     }
 
+    @Override
     public int compareTo(Object o)
     {
         ProtocolVersion pv = (ProtocolVersion) o;
@@ -118,11 +120,13 @@ public class ProtocolVersion  implements Comparable
 
     }
 
+    @Override
     public boolean equals(Object o)
     {
         return o != null && (o == this || (compareTo(o) == 0));
     }
 
+    @Override
     public int hashCode()
     {
         return (0xFF & (int)_minorVersion) | ((0xFF & (int)_majorVersion) << 8);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
index 03edaaa..3e51b20 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
@@ -205,6 +205,7 @@ public final class AMQShortString implements Comparable<AMQShortString>
     }
 
 
+    @Override
     public boolean equals(Object o)
     {
 
@@ -280,6 +281,7 @@ public final class AMQShortString implements Comparable<AMQShortString>
 
     }
 
+    @Override
     public int hashCode()
     {
         int hash = _hashCode;
@@ -308,6 +310,7 @@ public final class AMQShortString implements Comparable<AMQShortString>
         return _asString;
     }
 
+    @Override
     public int compareTo(AMQShortString name)
     {
         if(name == this)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
index 463aab9..29543b5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
@@ -34,11 +34,13 @@ public enum AMQType
 {
     LONG_STRING('S')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedLongStringLength((String) value);
         }
 
+        @Override
         public String toNativeValue(Object value)
         {
             if (value != null)
@@ -51,11 +53,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return EncodingUtils.readLongString(buffer);
@@ -64,11 +68,13 @@ public enum AMQType
 
     INTEGER('i')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.unsignedIntegerLength();
         }
 
+        @Override
         public Long toNativeValue(Object value)
         {
             if (value instanceof Long)
@@ -98,11 +104,13 @@ public enum AMQType
         }
 
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putLong( (Long) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getUnsignedInt();
@@ -111,11 +119,13 @@ public enum AMQType
 
     DECIMAL('D')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedByteLength() + EncodingUtils.encodedIntegerLength();
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if (value instanceof BigDecimal)
@@ -130,6 +140,7 @@ public enum AMQType
         }
 
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             BigDecimal bd = (BigDecimal) value;
@@ -143,6 +154,7 @@ public enum AMQType
             buffer.putInt(unscaled);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             byte places = buffer.get();
@@ -157,11 +169,13 @@ public enum AMQType
 
     TIMESTAMP('T')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedLongLength();
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if (value instanceof Long)
@@ -175,11 +189,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putLong ((Long) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getLong();
@@ -199,6 +215,7 @@ public enum AMQType
          *
          * @return The size of the instance of the type in bytes.
          */
+        @Override
         public int getEncodingSize(Object value)
         {
             // Ensure that the value is a FieldTable.
@@ -222,6 +239,7 @@ public enum AMQType
          *
          * @return An equivalent Java native representation.
          */
+        @Override
         public Object toNativeValue(Object value)
         {
             // Ensure that the value is a FieldTable.
@@ -233,6 +251,7 @@ public enum AMQType
             return (FieldTable) value;
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             // Ensure that the value is a FieldTable.
@@ -253,6 +272,7 @@ public enum AMQType
          *
          * @return An instance of the type.
          */
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             try
@@ -272,6 +292,7 @@ public enum AMQType
      */
     FIELD_ARRAY('A')
             {
+                @Override
                 public int getEncodingSize(Object value)
                 {
                     if (!(value instanceof Collection))
@@ -284,6 +305,7 @@ public enum AMQType
                     return 4 + fieldArrayValue.getEncodingSize();
                 }
 
+                @Override
                 public Object toNativeValue(Object value)
                 {
                     // Ensure that the value is a FieldTable.
@@ -295,6 +317,7 @@ public enum AMQType
                     return FieldArray.asFieldArray((Collection)value);
                 }
 
+                @Override
                 public void writeValueImpl(Object value, QpidByteBuffer buffer)
                 {
 
@@ -316,6 +339,7 @@ public enum AMQType
                  *
                  * @return An instance of the type.
                  */
+                @Override
                 public Object readValueFromBuffer(QpidByteBuffer buffer)
                 {
                     // Read size of field table then all name/value pairs.
@@ -325,11 +349,13 @@ public enum AMQType
             },
     VOID('V')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return 0;
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if (value == null)
@@ -343,9 +369,11 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         { }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return null;
@@ -354,11 +382,13 @@ public enum AMQType
 
     BINARY('x')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedLongstrLength((byte[]) value);
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if ((value instanceof byte[]) || (value == null))
@@ -372,11 +402,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             EncodingUtils.writeLongstr(buffer, (byte[]) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return EncodingUtils.readLongstr(buffer);
@@ -385,11 +417,13 @@ public enum AMQType
 
     ASCII_STRING('c')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedLongStringLength((String) value);
         }
 
+        @Override
         public String toNativeValue(Object value)
         {
             if (value != null)
@@ -402,11 +436,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return EncodingUtils.readLongString(buffer);
@@ -415,12 +451,14 @@ public enum AMQType
 
     WIDE_STRING('C')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             // FIXME: use proper charset encoder
             return EncodingUtils.encodedLongStringLength((String) value);
         }
 
+        @Override
         public String toNativeValue(Object value)
         {
             if (value != null)
@@ -433,11 +471,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return EncodingUtils.readLongString(buffer);
@@ -446,11 +486,13 @@ public enum AMQType
 
     BOOLEAN('t')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedBooleanLength();
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if (value instanceof Boolean)
@@ -468,11 +510,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             EncodingUtils.writeBoolean(buffer, (Boolean) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.get() == 1;
@@ -481,11 +525,13 @@ public enum AMQType
 
     ASCII_CHARACTER('k')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedCharLength();
         }
 
+        @Override
         public Character toNativeValue(Object value)
         {
             if (value instanceof Character)
@@ -503,12 +549,14 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             char charVal = (Character) value;
             buffer.put((byte) charVal);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return (char) buffer.get();
@@ -517,11 +565,13 @@ public enum AMQType
 
     BYTE('b')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedByteLength();
         }
 
+        @Override
         public Byte toNativeValue(Object value)
         {
             if (value instanceof Byte)
@@ -539,11 +589,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.put((Byte) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.get();
@@ -599,11 +651,13 @@ public enum AMQType
 
     SHORT('s')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedShortLength();
         }
 
+        @Override
         public Short toNativeValue(Object value)
         {
             if (value instanceof Short)
@@ -625,11 +679,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putShort((Short) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getShort();
@@ -685,11 +741,13 @@ public enum AMQType
 
     INT('I')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedIntegerLength();
         }
 
+        @Override
         public Integer toNativeValue(Object value)
         {
             if (value instanceof Integer)
@@ -714,10 +772,12 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putInt((Integer) value);
         }
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getInt();
@@ -726,11 +786,13 @@ public enum AMQType
 
     LONG('l')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedLongLength();
         }
 
+        @Override
         public Object toNativeValue(Object value)
         {
             if (value instanceof Long)
@@ -760,11 +822,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putLong ((Long) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getLong();
@@ -773,11 +837,13 @@ public enum AMQType
 
     FLOAT('f')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedFloatLength();
         }
 
+        @Override
         public Float toNativeValue(Object value)
         {
             if (value instanceof Float)
@@ -795,11 +861,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putFloat ((Float) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getFloat();
@@ -808,11 +876,13 @@ public enum AMQType
 
     DOUBLE('d')
     {
+        @Override
         public int getEncodingSize(Object value)
         {
             return EncodingUtils.encodedDoubleLength();
         }
 
+        @Override
         public Double toNativeValue(Object value)
         {
             if (value instanceof Double)
@@ -834,11 +904,13 @@ public enum AMQType
             }
         }
 
+        @Override
         public void writeValueImpl(Object value, QpidByteBuffer buffer)
         {
             buffer.putDouble((Double) value);
         }
 
+        @Override
         public Object readValueFromBuffer(QpidByteBuffer buffer)
         {
             return buffer.getDouble();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
index 60bd7a1..89fdc8d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
@@ -71,33 +71,39 @@ public abstract class AMQTypedValue
         }
 
 
+        @Override
         public AMQType getType()
         {
             return _type;
         }
 
+        @Override
         public Object getValue()
         {
             return _value;
         }
 
+        @Override
         public void writeToBuffer(QpidByteBuffer buffer)
         {
             _type.writeToBuffer(_value, buffer);
         }
 
+        @Override
         public int getEncodingSize()
         {
             return _type.getEncodingSize(_value);
         }
 
 
+        @Override
         public String toString()
         {
             return "[" + getType() + ": " + getValue() + "]";
         }
 
 
+        @Override
         public boolean equals(Object o)
         {
             if(o instanceof GenericTypedValue)
@@ -111,6 +117,7 @@ public abstract class AMQTypedValue
             }
         }
 
+        @Override
         public int hashCode()
         {
             return _type.hashCode() ^ (_value == null ? 0 : _value.hashCode());
@@ -133,17 +140,20 @@ public abstract class AMQTypedValue
             _value = buffer.getLong();
         }
 
+        @Override
         public AMQType getType()
         {
             return AMQType.LONG;
         }
 
 
+        @Override
         public Object getValue()
         {
             return _value;
         }
 
+        @Override
         public void writeToBuffer(QpidByteBuffer buffer)
         {
             buffer.put(AMQType.LONG.identifier());
@@ -151,6 +161,7 @@ public abstract class AMQTypedValue
         }
 
 
+        @Override
         public int getEncodingSize()
         {
             return EncodingUtils.encodedLongLength();
@@ -172,23 +183,27 @@ public abstract class AMQTypedValue
             _value = value;
         }
 
+        @Override
         public AMQType getType()
         {
             return AMQType.INT;
         }
 
 
+        @Override
         public Object getValue()
         {
             return _value;
         }
 
+        @Override
         public void writeToBuffer(QpidByteBuffer buffer)
         {
             buffer.put(AMQType.INT.identifier());
             buffer.putInt(_value);
         }
 
+        @Override
         public int getEncodingSize()
         {
             return EncodingUtils.encodedIntegerLength();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
index e183010..db5ce22 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
@@ -763,6 +763,7 @@ public class FieldTable
         return itemExists(AMQShortString.valueOf(string));
     }
 
+    @Override
     public String toString()
     {
         initMapIfNecessary();
@@ -898,6 +899,7 @@ public class FieldTable
                     new FieldTableElementProcessor()
                     {
 
+                        @Override
                         public boolean processElement(String propertyName, AMQTypedValue value)
                         {
                             Object val = value.getValue();
@@ -913,6 +915,7 @@ public class FieldTable
                             return true;
                         }
 
+                        @Override
                         public Object getResult()
                         {
                             return map;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index bd2f6a3..21d24f2 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -691,6 +691,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public boolean isExclusive()
     {
         return _exclusive != ExclusivityPolicy.NONE;
@@ -789,6 +790,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return new ArrayList<String>(_arguments.keySet());
     }
 
+    @Override
     public String getOwner()
     {
         if(_exclusiveOwner != null)
@@ -810,6 +812,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return _creatingLinkInfo;
     }
 
+    @Override
     public QueueManagingVirtualHost<?> getVirtualHost()
     {
         return _virtualHost;
@@ -1168,6 +1171,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
     }
 
 
+    @Override
     public Collection<PublishingLink> getPublishingLinks()
     {
         List<PublishingLink> links = new ArrayList<>();
@@ -1185,6 +1189,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return _bindingCount;
     }
 
+    @Override
     public LogSubject getLogSubject()
     {
         return _logSubject;
@@ -1192,6 +1197,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
 
     // ------ Enqueue / Dequeue
 
+    @Override
     public final void enqueue(ServerMessage message, Action<? super MessageInstance> action, MessageEnqueueRecord enqueueRecord)
     {
 
@@ -1235,6 +1241,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public final void recover(ServerMessage message, final MessageEnqueueRecord enqueueRecord)
     {
         doEnqueue(message, null, enqueueRecord);
@@ -1364,11 +1371,13 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         // Simple Queues don't :-)
     }
 
+    @Override
     public long getTotalDequeuedMessages()
     {
         return _queueStatistics.getDequeueCount();
     }
 
+    @Override
     public long getTotalEnqueuedMessages()
     {
         return _queueStatistics.getEnqueueCount();
@@ -1436,21 +1445,25 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public int getConsumerCount()
     {
         return _queueConsumerManager.getAllSize();
     }
 
+    @Override
     public int getConsumerCountWithCredit()
     {
         return _activeSubscriberCount.get();
     }
 
+    @Override
     public boolean isUnused()
     {
         return getConsumerCount() == 0;
     }
 
+    @Override
     public boolean isEmpty()
     {
         return getQueueDepthMessages() == 0;
@@ -1550,11 +1563,13 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return oldestMessageArrivalTime == 0 ? 0 : System.currentTimeMillis() - oldestMessageArrivalTime;
     }
 
+    @Override
     public boolean isDeleted()
     {
         return _deleted.get();
     }
 
+    @Override
     public List<QueueEntry> getMessagesOnTheQueue()
     {
         ArrayList<QueueEntry> entryList = new ArrayList<QueueEntry>();
@@ -1577,6 +1592,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return getEntries().iterator();
     }
 
+    @Override
     public int compareTo(final X o)
     {
         return getName().compareTo(o.getName());
@@ -1618,18 +1634,21 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
     }
 
 
+    @Override
     public QueueEntry getMessageOnTheQueue(final long messageId)
     {
         List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
         {
             private boolean _complete;
 
+            @Override
             public boolean accept(QueueEntry entry)
             {
                 _complete = entry.getMessage().getMessageNumber() == messageId;
                 return _complete;
             }
 
+            @Override
             public boolean filterComplete()
             {
                 return _complete;
@@ -1666,6 +1685,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
 
     }
 
+    @Override
     public void visit(final QueueEntryVisitor visitor)
     {
         QueueEntryIterator queueListIterator = getEntries().iterator();
@@ -1739,11 +1759,13 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
                     new ServerTransaction.Action()
                     {
 
+                        @Override
                         public void postCommit()
                         {
                             node.delete();
                         }
 
+                        @Override
                         public void onRollback()
                         {
 
@@ -2134,6 +2156,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public boolean isEntryAheadOfConsumer(QueueEntry entry, QueueConsumer<?,?> sub)
     {
         QueueContext context = sub.getQueueContext();
@@ -2149,6 +2172,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
     }
 
 
+    @Override
     public void checkMessageStatus()
     {
         QueueEntryIterator queueListIterator = getEntries().iterator();
@@ -2294,16 +2318,19 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public long getAlertRepeatGap()
     {
         return _alertRepeatGap;
     }
 
+    @Override
     public long getAlertThresholdMessageAge()
     {
         return _alertThresholdMessageAge;
     }
 
+    @Override
     public long getAlertThresholdQueueDepthMessages()
     {
         return _alertThresholdQueueDepthMessages;
@@ -2329,16 +2356,19 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public long getAlertThresholdQueueDepthBytes()
     {
         return _alertThresholdQueueDepthBytes;
     }
 
+    @Override
     public long getAlertThresholdMessageSize()
     {
         return _alertThresholdMessageSize;
     }
 
+    @Override
     public Set<NotificationCheck> getNotificationChecks()
     {
         return _notificationChecks;
@@ -2507,42 +2537,50 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
 
     private static class AcquireAllQueueEntryFilter implements QueueEntryFilter
     {
+        @Override
         public boolean accept(QueueEntry entry)
         {
             return entry.acquire();
         }
 
+        @Override
         public boolean filterComplete()
         {
             return false;
         }
     }
 
+    @Override
     public long getTotalEnqueuedBytes()
     {
         return _queueStatistics.getEnqueueSize();
     }
 
+    @Override
     public long getTotalDequeuedBytes()
     {
         return _queueStatistics.getDequeueSize();
     }
 
+    @Override
     public long getPersistentEnqueuedBytes()
     {
         return _queueStatistics.getPersistentEnqueueSize();
     }
 
+    @Override
     public long getPersistentDequeuedBytes()
     {
         return _queueStatistics.getPersistentDequeueSize();
     }
 
+    @Override
     public long getPersistentEnqueuedMessages()
     {
         return _queueStatistics.getPersistentEnqueueCount();
     }
 
+    @Override
     public long getPersistentDequeuedMessages()
     {
         return _queueStatistics.getPersistentDequeueCount();
@@ -2591,11 +2629,13 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         return getName();
     }
 
+    @Override
     public long getUnacknowledgedMessages()
     {
         return _queueStatistics.getUnackedCount();
     }
 
+    @Override
     public long getUnacknowledgedBytes()
     {
         return _queueStatistics.getUnackedSize();
@@ -2641,6 +2681,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
     }
 
+    @Override
     public void setNotificationListener(QueueNotificationListener  listener)
     {
         _notificationListener = listener == null ? NULL_NOTIFICATION_LISTENER : listener;
@@ -3350,6 +3391,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
 
 
+        @Override
         public boolean visit(QueueEntry entry)
         {
             ServerMessage message = entry.getMessage();
@@ -3414,6 +3456,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         }
 
 
+        @Override
         public boolean visit(QueueEntry entry)
         {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
index 1df078f..7c110f8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
@@ -56,6 +56,7 @@ abstract class AbstractQueueEntryList implements QueueEntryList
         }
     }
 
+    @Override
     public void updateStatsOnStateChange(QueueEntry entry, QueueEntry.EntryState fromState, QueueEntry.EntryState toState)
     {
         final QueueStatistics queueStatistics = _queueStatistics;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
index 8af2f52..38eac28 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
@@ -53,6 +53,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager
         return val;
     }
 
+    @Override
     public boolean mightAssign(final QueueEntry entry, QueueConsumer sub)
     {
         Object groupVal = entry.getMessage().getMessageHeader().getHeader(_groupId);
@@ -68,6 +69,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager
         }
     }
 
+    @Override
     public boolean acceptMessage(QueueConsumer<?,?> sub, QueueEntry entry)
     {
         return assignMessage(sub, entry) && entry.acquire(sub);
@@ -104,6 +106,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager
         }
     }
     
+    @Override
     public QueueEntry findEarliestAssignedAvailableEntry(QueueConsumer<?,?> sub)
     {
         EntryFinder visitor = new EntryFinder(sub);
@@ -121,6 +124,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager
             _sub = sub;
         }
 
+        @Override
         public boolean visit(final QueueEntry entry)
         {
             if(!entry.isAvailable())
@@ -153,6 +157,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager
         }
     }
 
+    @Override
     public void clearAssignments(QueueConsumer<?,?> sub)
     {
         Iterator<QueueConsumer<?,?>> subIter = _groupMap.values().iterator();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java b/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
index bf5dc17..c8e790e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
@@ -140,6 +140,7 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
         _resetHelper = resetHelper;
     }
     
+    @Override
     public synchronized boolean mightAssign(final QueueEntry entry, final QueueConsumer sub)
     {
         Object groupId = getKey(entry);
@@ -153,6 +154,7 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
         return possibleAssignment;
     }
 
+    @Override
     public synchronized boolean acceptMessage(final QueueConsumer<?,?> sub, final QueueEntry entry)
     {
         return assignMessage(sub, entry) && entry.acquire(sub);
@@ -192,6 +194,7 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
         }
     }
 
+    @Override
     public synchronized QueueEntry findEarliestAssignedAvailableEntry(final QueueConsumer<?,?> sub)
     {
         EntryFinder visitor = new EntryFinder(sub);
@@ -209,6 +212,7 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
             _sub = sub;
         }
 
+        @Override
         public boolean visit(final QueueEntry entry)
         {
             if(!entry.isAvailable())
@@ -237,6 +241,7 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
     }
 
     
+    @Override
     public void clearAssignments(final QueueConsumer<?,?> sub)
     {
     }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java b/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java
index 4e42c08..5e602a1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java
@@ -38,6 +38,7 @@ public class MoveMessagesTransaction extends QueueSizeLimitRespectingTransaction
     }
 
 
+    @Override
     void performOperation(final QueueEntry entry,
                           final QueueManagingVirtualHost.Transaction txn,
                           final Queue destinationQueue)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
index bc7243f..d7ee7c0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
@@ -33,6 +33,7 @@ public enum NotificationCheck
 
     MESSAGE_COUNT_ALERT
     {
+        @Override
         public boolean notifyIfNecessary(ServerMessage<?> msg, Queue<?> queue, QueueNotificationListener listener)
         {
             int msgCount;
@@ -50,6 +51,7 @@ public enum NotificationCheck
     },
     MESSAGE_SIZE_ALERT(true, true)
     {
+        @Override
         public boolean notifyIfNecessary(ServerMessage<?> msg, Queue<?> queue, QueueNotificationListener  listener)
         {
             final long maximumMessageSize = queue.getAlertThresholdMessageSize();
@@ -74,6 +76,7 @@ public enum NotificationCheck
     },
     QUEUE_DEPTH_ALERT
     {
+        @Override
         public boolean notifyIfNecessary(ServerMessage<?> msg, Queue<?> queue, QueueNotificationListener  listener)
         {
             // Check for threshold queue depth in bytes
@@ -98,6 +101,7 @@ public enum NotificationCheck
     },
     MESSAGE_AGE_ALERT(false, false)
     {
+        @Override
         public boolean notifyIfNecessary(ServerMessage<?> msg, Queue<?> queue, QueueNotificationListener  listener)
         {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java b/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
index 272abdc..9c0fdc0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
@@ -79,12 +79,14 @@ public abstract class OrderedQueueEntryList extends AbstractQueueEntryList
     }
 
 
+    @Override
     public Queue<?> getQueue()
     {
         return _queue;
     }
 
 
+    @Override
     public QueueEntry add(ServerMessage message, final MessageEnqueueRecord enqueueRecord)
     {
         final OrderedQueueEntry node = createQueueEntry(message, enqueueRecord);
@@ -136,16 +138,19 @@ public abstract class OrderedQueueEntryList extends AbstractQueueEntryList
             _lastNode = startNode;
         }
 
+        @Override
         public boolean atTail()
         {
             return _lastNode.getNextValidEntry() == null;
         }
 
+        @Override
         public QueueEntry getNode()
         {
             return _lastNode;
         }
 
+        @Override
         public boolean advance()
         {
             QueueEntry nextValidNode = _lastNode.getNextValidEntry();
@@ -159,12 +164,14 @@ public abstract class OrderedQueueEntryList extends AbstractQueueEntryList
         }
     }
 
+    @Override
     public QueueEntryIterator iterator()
     {
         return new QueueEntryIteratorImpl(_head);
     }
 
 
+    @Override
     public QueueEntry getHead()
     {
         return _head;
@@ -176,6 +183,7 @@ public abstract class OrderedQueueEntryList extends AbstractQueueEntryList
         return _tail;
     }
 
+    @Override
     public void entryDeleted(QueueEntry queueEntry)
     {
         QueueEntry next = _head.getNextNode();
@@ -206,6 +214,7 @@ public abstract class OrderedQueueEntryList extends AbstractQueueEntryList
         }
     }
 
+    @Override
     public int getPriorities()
     {
         return 0;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java b/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java
index 148f0be..e492a7b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java
@@ -62,6 +62,7 @@ public class PriorityQueueImpl extends OutOfOrderQueue<PriorityQueueImpl> implem
         return _entries;
     }
 
+    @Override
     protected LogMessage getCreatedLogMessage()
     {
         String ownerString = getOwner();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
index 910b57b..429c318 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
@@ -67,6 +67,7 @@ abstract public class PriorityQueueList extends OrderedQueueEntryList
             }
         }
 
+        @Override
         public int getPriorities()
         {
             return _priorities;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
index 63b1d94..5da8c7d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
@@ -265,6 +265,7 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         return _priority;
     }
 
+    @Override
     public void flushBatched()
     {
         _target.flushBatched();
@@ -288,21 +289,25 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         return _queueConsumerNode;
     }
 
+    @Override
     public void queueDeleted()
     {
         _target.consumerRemoved(this);
     }
 
+    @Override
     public boolean allocateCredit(final QueueEntry msg)
     {
         return _target.allocateCredit(msg.getMessage());
     }
 
+    @Override
     public void restoreCredit(final QueueEntry queueEntry)
     {
         _target.restoreCredit(queueEntry.getMessage());
     }
 
+    @Override
     public void queueEmpty()
     {
         _target.queueEmpty();
@@ -351,11 +356,13 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         _queue.setNotifyWorkDesired(this, desired);
     }
 
+    @Override
     public final long getConsumerNumber()
     {
         return _consumerNumber;
     }
 
+    @Override
     public final QueueContext getQueueContext()
     {
         return _queueContext;
@@ -366,16 +373,19 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         _queueContext = queueContext;
     }
 
+    @Override
     public final boolean isActive()
     {
         return _target.getState() == ConsumerTarget.State.OPEN;
     }
 
+    @Override
     public final boolean isClosed()
     {
         return _target.getState() == ConsumerTarget.State.CLOSED;
     }
 
+    @Override
     public final boolean hasInterest(QueueEntry entry)
     {
        //check that the message hasn't been rejected
@@ -470,16 +480,19 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         return _createTime;
     }
 
+    @Override
     public final MessageInstance.StealableConsumerAcquiredState<QueueConsumerImpl<T>> getOwningState()
     {
         return _owningState;
     }
 
+    @Override
     public final boolean acquires()
     {
         return _acquires;
     }
 
+    @Override
     public final boolean seesRequeues()
     {
         return _seesRequeues;
@@ -490,11 +503,13 @@ class QueueConsumerImpl<T extends ConsumerTarget>
         return _isTransient;
     }
 
+    @Override
     public final long getBytesOut()
     {
         return _deliveredBytes.longValue();
     }
 
+    @Override
     public final long getMessagesOut()
     {
         return _deliveredCount.longValue();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 3e36ef1..c3975c8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -162,11 +162,13 @@ public abstract class QueueEntryImpl implements QueueEntry
         }
     }
 
+    @Override
     public void setExpiration(long expiration)
     {
         _expiration = expiration;
     }
 
+    @Override
     public InstanceProperties getInstanceProperties()
     {
         return new EntryInstanceProperties();
@@ -182,31 +184,37 @@ public abstract class QueueEntryImpl implements QueueEntry
         return _entryId;
     }
 
+    @Override
     public Queue<?> getQueue()
     {
         return _queueEntryList.getQueue();
     }
 
+    @Override
     public ServerMessage getMessage()
     {
         return  _message == null ? null : _message.getMessage();
     }
 
+    @Override
     public long getSize()
     {
         return getMessage() == null ? 0 : getMessage().getSize();
     }
 
+    @Override
     public long getSizeWithHeader()
     {
         return getMessage() == null ? 0 : getMessage().getSizeIncludingHeader();
     }
 
+    @Override
     public boolean getDeliveredToConsumer()
     {
         return _deliveryCountUpdater.get(this) != -1;
     }
 
+    @Override
     public boolean expired()
     {
         long expiration = _expiration;
@@ -220,16 +228,19 @@ public abstract class QueueEntryImpl implements QueueEntry
 
     }
 
+    @Override
     public boolean isAvailable()
     {
         return _state.getState() == State.AVAILABLE;
     }
 
+    @Override
     public boolean isAcquired()
     {
         return _state.getState() == State.ACQUIRED;
     }
 
+    @Override
     public boolean acquire()
     {
         return acquire(NON_CONSUMER_ACQUIRED_STATE);
@@ -314,6 +325,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return acquired;
     }
 
+    @Override
     public boolean acquire(MessageInstanceConsumer sub)
     {
         final boolean acquired = acquire(((QueueConsumer<?,?>) sub).getOwningState().getUnstealableState());
@@ -360,6 +372,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return false;
     }
 
+    @Override
     public boolean acquiredByConsumer()
     {
         return _state instanceof ConsumerAcquiredState;
@@ -479,6 +492,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return false;
     }
 
+    @Override
     public void reject()
     {
         QueueConsumer<?,?> consumer = getAcquiringConsumer();
@@ -559,6 +573,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         }
     }
 
+    @Override
     public void delete()
     {
         if(dequeue())
@@ -567,6 +582,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         }
     }
 
+    @Override
     public int routeToAlternate(final Action<? super MessageInstance> action, ServerTransaction txn)
     {
         if (!isAcquired())
@@ -595,11 +611,13 @@ public abstract class QueueEntryImpl implements QueueEntry
         }
         txn.addPostTransactionAction(new ServerTransaction.Action()
         {
+            @Override
             public void postCommit()
             {
                 delete();
             }
 
+            @Override
             public void onRollback()
             {
 
@@ -614,11 +632,13 @@ public abstract class QueueEntryImpl implements QueueEntry
         return  enqueues;
     }
 
+    @Override
     public boolean isQueueDeleted()
     {
         return getQueue().isDeleted();
     }
 
+    @Override
     public void addStateChangeListener(StateChangeListener<? super MessageInstance, EntryState> listener)
     {
         StateChangeListenerEntry<? super QueueEntry, EntryState> entry = new StateChangeListenerEntry<>(listener);
@@ -628,6 +648,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         }
     }
 
+    @Override
     public boolean removeStateChangeListener(StateChangeListener<? super MessageInstance, EntryState> listener)
     {
         StateChangeListenerEntry entry = _listenersUpdater.get(this);
@@ -650,6 +671,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return _queueEntryList;
     }
 
+    @Override
     public boolean isDeleted()
     {
         return _state.isDispensed();
@@ -661,6 +683,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return checkHeld(System.currentTimeMillis());
     }
 
+    @Override
     public int getDeliveryCount()
     {
         return _deliveryCount == -1 ? 0 : _deliveryCount;
@@ -672,12 +695,14 @@ public abstract class QueueEntryImpl implements QueueEntry
         return getQueue().getMaximumDeliveryAttempts();
     }
 
+    @Override
     public void incrementDeliveryCount()
     {
         _deliveryCountUpdater.compareAndSet(this,-1,0);
         _deliveryCountUpdater.incrementAndGet(this);
     }
 
+    @Override
     public void decrementDeliveryCount()
     {
         _deliveryCountUpdater.decrementAndGet(this);
@@ -689,6 +714,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return Filterable.Factory.newInstance(getMessage(), getInstanceProperties());
     }
 
+    @Override
     public String toString()
     {
         return "QueueEntryImpl{" +
@@ -703,6 +729,7 @@ public abstract class QueueEntryImpl implements QueueEntry
         return getQueue();
     }
 
+    @Override
     public void setRedelivered()
     {
         _flags |= REDELIVERED_FLAG;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java
index ddeee1f..a8c0129 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java
@@ -52,6 +52,7 @@ abstract class QueueEntryTransaction implements QueueManagingVirtualHost.Transac
             _sourceQueue.visit(new QueueEntryVisitor()
             {
 
+                @Override
                 public boolean visit(final QueueEntry entry)
                 {
                     final ServerMessage message = entry.getMessage();


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