You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/12/07 19:39:48 UTC

[36/42] activemq-artemis git commit: Add missing @Override annotations

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 315721f..4b3f5c3 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -86,6 +86,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
 
    // StreamMessage implementation ----------------------------------
 
+   @Override
    public boolean readBoolean() throws JMSException {
       checkRead();
       try {
@@ -99,6 +100,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public byte readByte() throws JMSException {
       checkRead();
 
@@ -113,6 +115,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public short readShort() throws JMSException {
       checkRead();
       try {
@@ -126,6 +129,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public char readChar() throws JMSException {
       checkRead();
       try {
@@ -139,6 +143,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public int readInt() throws JMSException {
       checkRead();
       try {
@@ -152,6 +157,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public long readLong() throws JMSException {
       checkRead();
       try {
@@ -165,6 +171,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public float readFloat() throws JMSException {
       checkRead();
       try {
@@ -178,6 +185,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public double readDouble() throws JMSException {
       checkRead();
       try {
@@ -191,6 +199,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public String readString() throws JMSException {
       checkRead();
       try {
@@ -209,6 +218,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
     */
    private int len = 0;
 
+   @Override
    public int readBytes(final byte[] value) throws JMSException {
       checkRead();
       try {
@@ -225,6 +235,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public Object readObject() throws JMSException {
       checkRead();
       try {
@@ -238,60 +249,70 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public void writeBoolean(final boolean value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.BOOLEAN);
       getBuffer().writeBoolean(value);
    }
 
+   @Override
    public void writeByte(final byte value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.BYTE);
       getBuffer().writeByte(value);
    }
 
+   @Override
    public void writeShort(final short value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.SHORT);
       getBuffer().writeShort(value);
    }
 
+   @Override
    public void writeChar(final char value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.CHAR);
       getBuffer().writeShort((short) value);
    }
 
+   @Override
    public void writeInt(final int value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.INT);
       getBuffer().writeInt(value);
    }
 
+   @Override
    public void writeLong(final long value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.LONG);
       getBuffer().writeLong(value);
    }
 
+   @Override
    public void writeFloat(final float value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.FLOAT);
       getBuffer().writeInt(Float.floatToIntBits(value));
    }
 
+   @Override
    public void writeDouble(final double value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.DOUBLE);
       getBuffer().writeLong(Double.doubleToLongBits(value));
    }
 
+   @Override
    public void writeString(final String value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.STRING);
       getBuffer().writeNullableString(value);
    }
 
+   @Override
    public void writeBytes(final byte[] value) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.BYTES);
@@ -299,6 +320,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       getBuffer().writeBytes(value);
    }
 
+   @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
       checkWrite();
       getBuffer().writeByte(DataConstants.BYTES);
@@ -306,6 +328,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       getBuffer().writeBytes(value, offset, length);
    }
 
+   @Override
    public void writeObject(final Object value) throws JMSException {
       if (value instanceof String) {
          writeString((String) value);
@@ -345,6 +368,7 @@ public final class ActiveMQStreamMessage extends ActiveMQMessage implements Stre
       }
    }
 
+   @Override
    public void reset() throws JMSException {
       if (!readOnly) {
          readOnly = true;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index bd0a615..aa36336 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -74,6 +74,7 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
 
    // TextMessage implementation ------------------------------------
 
+   @Override
    public void setText(final String text) throws JMSException {
       checkWrite();
 
@@ -87,6 +88,7 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
       writeBodyText(message.getBodyBuffer(), this.text);
    }
 
+   @Override
    public String getText() {
       if (text != null) {
          return text.toString();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
index d959d26..14f4e50 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
@@ -59,6 +59,7 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic {
 
    // Topic implementation ------------------------------------------
 
+   @Override
    public String getTopicName() {
       return name;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java
index bc588d3..08a5187 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopicConnectionFactory.java
@@ -54,6 +54,7 @@ public class ActiveMQTopicConnectionFactory extends ActiveMQConnectionFactory im
       super(ha, initialConnectors);
    }
 
+   @Override
    public int getFactoryType() {
       return JMSFactoryType.TOPIC_CF.intValue();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java
index fca6856..5724dac 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAQueueConnectionFactory.java
@@ -54,6 +54,7 @@ public class ActiveMQXAQueueConnectionFactory extends ActiveMQConnectionFactory
       super(ha, initialConnectors);
    }
 
+   @Override
    public int getFactoryType() {
       return JMSFactoryType.QUEUE_XA_CF.intValue();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java
index de20159..b184cb3 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXATopicConnectionFactory.java
@@ -54,6 +54,7 @@ public class ActiveMQXATopicConnectionFactory extends ActiveMQConnectionFactory
       super(ha, initialConnectors);
    }
 
+   @Override
    public int getFactoryType() {
       return JMSFactoryType.TOPIC_XA_CF.intValue();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java
index 1a6c95a..0d831f0 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSMessageListenerWrapper.java
@@ -61,6 +61,7 @@ public class JMSMessageListenerWrapper implements MessageHandler {
     * In this method we apply the JMS acknowledgement and redelivery semantics
     * as per JMS spec
     */
+   @Override
    public void onMessage(final ClientMessage message) {
       ActiveMQMessage msg = ActiveMQMessage.createMessage(message, session.getCoreSession());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
index b61a51e..69db241 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
@@ -30,6 +30,7 @@ import javax.naming.spi.ObjectFactory;
  */
 public class ConnectionFactoryObjectFactory implements ObjectFactory {
 
+   @Override
    public Object getObjectInstance(final Object ref,
                                    final Name name,
                                    final Context ctx,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
index 59533e0..4f4ea65 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
@@ -30,6 +30,7 @@ import javax.naming.spi.ObjectFactory;
  */
 public class DestinationObjectFactory implements ObjectFactory {
 
+   @Override
    public Object getObjectInstance(final Object ref,
                                    final Name name,
                                    final Context ctx,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
index ba7474f..4f019c9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
@@ -47,6 +47,7 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory {
    private String queuePrefix = "queue.";
    private String topicPrefix = "topic.";
 
+   @Override
    public Context getInitialContext(Hashtable environment) throws NamingException {
       // lets create a factory
       Map<String, Object> data = new ConcurrentHashMap<>();
@@ -72,6 +73,7 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory {
       data.put(DYNAMIC_QUEUE_CONTEXT, new LazyCreateContext() {
          private static final long serialVersionUID = 6503881346214855588L;
 
+         @Override
          protected Object createEntry(String name) {
             return ActiveMQJMSClient.createQueue(name);
          }
@@ -79,6 +81,7 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory {
       data.put(DYNAMIC_TOPIC_CONTEXT, new LazyCreateContext() {
          private static final long serialVersionUID = 2019166796234979615L;
 
+         @Override
          protected Object createEntry(String name) {
             return ActiveMQJMSClient.createTopic(name);
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java
index a817d69..ff2c62c 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/LazyCreateContext.java
@@ -21,6 +21,7 @@ import javax.naming.NamingException;
 
 public abstract class LazyCreateContext extends ReadOnlyContext {
 
+   @Override
    public Object lookup(String name) throws NamingException {
       try {
          return super.lookup(name);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java
index b469cb8..fa7a4e9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/NameParserImpl.java
@@ -23,6 +23,7 @@ import javax.naming.NamingException;
 
 public class NameParserImpl implements NameParser {
 
+   @Override
    public Name parse(String name) throws NamingException {
       return new CompositeName(name);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
index f0daa9f..e94377d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ReadOnlyContext.java
@@ -196,18 +196,22 @@ public class ReadOnlyContext implements Context, Serializable {
       return new ReadOnlyContext();
    }
 
+   @Override
    public Object addToEnvironment(String propName, Object propVal) throws NamingException {
       return environment.put(propName, propVal);
    }
 
+   @Override
    public Hashtable<String, Object> getEnvironment() throws NamingException {
       return (Hashtable<String, Object>) environment.clone();
    }
 
+   @Override
    public Object removeFromEnvironment(String propName) throws NamingException {
       return environment.remove(propName);
    }
 
+   @Override
    public Object lookup(String name) throws NamingException {
       if (name.length() == 0) {
          return this;
@@ -273,26 +277,31 @@ public class ReadOnlyContext implements Context, Serializable {
       return result;
    }
 
+   @Override
    public Object lookup(Name name) throws NamingException {
       return lookup(name.toString());
    }
 
+   @Override
    public Object lookupLink(String name) throws NamingException {
       return lookup(name);
    }
 
+   @Override
    public Name composeName(Name name, Name prefix) throws NamingException {
       Name result = (Name) prefix.clone();
       result.addAll(name);
       return result;
    }
 
+   @Override
    public String composeName(String name, String prefix) throws NamingException {
       CompositeName result = new CompositeName(prefix);
       result.addAll(new CompositeName(name));
       return result.toString();
    }
 
+   @Override
    public NamingEnumeration list(String name) throws NamingException {
       Object o = lookup(name);
       if (o == this) {
@@ -306,6 +315,7 @@ public class ReadOnlyContext implements Context, Serializable {
       }
    }
 
+   @Override
    public NamingEnumeration listBindings(String name) throws NamingException {
       Object o = lookup(name);
       if (o == this) {
@@ -319,78 +329,97 @@ public class ReadOnlyContext implements Context, Serializable {
       }
    }
 
+   @Override
    public Object lookupLink(Name name) throws NamingException {
       return lookupLink(name.toString());
    }
 
+   @Override
    public NamingEnumeration list(Name name) throws NamingException {
       return list(name.toString());
    }
 
+   @Override
    public NamingEnumeration listBindings(Name name) throws NamingException {
       return listBindings(name.toString());
    }
 
+   @Override
    public void bind(Name name, Object obj) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void bind(String name, Object obj) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void close() throws NamingException {
       // ignore
    }
 
+   @Override
    public Context createSubcontext(Name name) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public Context createSubcontext(String name) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void destroySubcontext(Name name) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void destroySubcontext(String name) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public String getNameInNamespace() throws NamingException {
       return nameInNamespace;
    }
 
+   @Override
    public NameParser getNameParser(Name name) throws NamingException {
       return NAME_PARSER;
    }
 
+   @Override
    public NameParser getNameParser(String name) throws NamingException {
       return NAME_PARSER;
    }
 
+   @Override
    public void rebind(Name name, Object obj) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void rebind(String name, Object obj) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void rename(Name oldName, Name newName) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void rename(String oldName, String newName) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void unbind(Name name) throws NamingException {
       throw new OperationNotSupportedException();
    }
 
+   @Override
    public void unbind(String name) throws NamingException {
       throw new OperationNotSupportedException();
    }
@@ -399,10 +428,12 @@ public class ReadOnlyContext implements Context, Serializable {
 
       private final Iterator i = bindings.entrySet().iterator();
 
+      @Override
       public boolean hasMore() throws NamingException {
          return i.hasNext();
       }
 
+      @Override
       public boolean hasMoreElements() {
          return i.hasNext();
       }
@@ -411,6 +442,7 @@ public class ReadOnlyContext implements Context, Serializable {
          return (Map.Entry) i.next();
       }
 
+      @Override
       public void close() throws NamingException {
       }
    }
@@ -420,10 +452,12 @@ public class ReadOnlyContext implements Context, Serializable {
       ListEnumeration() {
       }
 
+      @Override
       public Object next() throws NamingException {
          return nextElement();
       }
 
+      @Override
       public Object nextElement() {
          Map.Entry entry = getNext();
          return new NameClassPair((String) entry.getKey(), entry.getValue().getClass().getName());
@@ -435,10 +469,12 @@ public class ReadOnlyContext implements Context, Serializable {
       ListBindingEnumeration() {
       }
 
+      @Override
       public Object next() throws NamingException {
          return nextElement();
       }
 
+      @Override
       public Object nextElement() {
          Map.Entry entry = getNext();
          return new Binding((String) entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
index 79b10d7..7734c9e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
@@ -35,46 +35,57 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
 
    // Public --------------------------------------------------------
 
+   @Override
    public void pause() throws Exception {
       bridge.pause();
    }
 
+   @Override
    public void resume() throws Exception {
       bridge.resume();
    }
 
+   @Override
    public boolean isStarted() {
       return bridge.isStarted();
    }
 
+   @Override
    public void start() throws Exception {
       bridge.start();
    }
 
+   @Override
    public void stop() throws Exception {
       bridge.stop();
    }
 
+   @Override
    public String getClientID() {
       return bridge.getClientID();
    }
 
+   @Override
    public long getFailureRetryInterval() {
       return bridge.getFailureRetryInterval();
    }
 
+   @Override
    public int getMaxBatchSize() {
       return bridge.getMaxBatchSize();
    }
 
+   @Override
    public long getMaxBatchTime() {
       return bridge.getMaxBatchTime();
    }
 
+   @Override
    public int getMaxRetries() {
       return bridge.getMaxRetries();
    }
 
+   @Override
    public String getQualityOfServiceMode() {
       QualityOfServiceMode mode = bridge.getQualityOfServiceMode();
       if (mode != null) {
@@ -85,66 +96,82 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
       }
    }
 
+   @Override
    public String getSelector() {
       return bridge.getSelector();
    }
 
+   @Override
    public String getSourcePassword() {
       return bridge.getSourcePassword();
    }
 
+   @Override
    public String getSourceUsername() {
       return bridge.getSourceUsername();
    }
 
+   @Override
    public String getSubscriptionName() {
       return bridge.getSubscriptionName();
    }
 
+   @Override
    public String getTargetPassword() {
       return bridge.getTargetPassword();
    }
 
+   @Override
    public String getTargetUsername() {
       return bridge.getTargetUsername();
    }
 
+   @Override
    public boolean isAddMessageIDInHeader() {
       return bridge.isAddMessageIDInHeader();
    }
 
+   @Override
    public boolean isFailed() {
       return bridge.isFailed();
    }
 
+   @Override
    public boolean isPaused() {
       return bridge.isPaused();
    }
 
+   @Override
    public void setAddMessageIDInHeader(final boolean value) {
       bridge.setAddMessageIDInHeader(value);
    }
 
+   @Override
    public void setClientID(final String clientID) {
       bridge.setClientID(clientID);
    }
 
+   @Override
    public void setFailureRetryInterval(final long interval) {
       bridge.setFailureRetryInterval(interval);
    }
 
+   @Override
    public void setMaxBatchSize(final int size) {
       bridge.setMaxBatchSize(size);
    }
 
+   @Override
    public void setMaxBatchTime(final long time) {
       bridge.setMaxBatchTime(time);
    }
 
+   @Override
    public void setMaxRetries(final int retries) {
       bridge.setMaxRetries(retries);
    }
 
+   @Override
    public void setQualityOfServiceMode(String mode) {
       if (mode != null) {
          bridge.setQualityOfServiceMode(QualityOfServiceMode.valueOf(mode));
@@ -154,26 +181,32 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
       }
    }
 
+   @Override
    public void setSelector(final String selector) {
       bridge.setSelector(selector);
    }
 
+   @Override
    public void setSourcePassword(final String pwd) {
       bridge.setSourcePassword(pwd);
    }
 
+   @Override
    public void setSourceUsername(final String name) {
       bridge.setSourceUsername(name);
    }
 
+   @Override
    public void setSubscriptionName(final String subname) {
       bridge.setSubscriptionName(subname);
    }
 
+   @Override
    public void setTargetPassword(final String pwd) {
       bridge.setTargetPassword(pwd);
    }
 
+   @Override
    public void setTargetUsername(final String name) {
       bridge.setTargetUsername(name);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index f3bd337..6e190eb 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -319,12 +319,14 @@ public final class JMSBridgeImpl implements JMSBridge {
 
    // ActiveMQComponent overrides --------------------------------------------------
 
+   @Override
    public synchronized void start() throws Exception {
       synchronized (stoppingGuard) {
          stopping = false;
       }
 
       moduleTccl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+         @Override
          public ClassLoader run() {
             return Thread.currentThread().getContextClassLoader();
          }
@@ -448,6 +450,7 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
+   @Override
    public void stop() throws Exception {
       synchronized (stoppingGuard) {
          if (stopping)
@@ -523,6 +526,7 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
+   @Override
    public synchronized boolean isStarted() {
       return started;
    }
@@ -540,6 +544,7 @@ public final class JMSBridgeImpl implements JMSBridge {
 
    // JMSBridge implementation ------------------------------------------------------------
 
+   @Override
    public synchronized void pause() throws Exception {
       if (JMSBridgeImpl.trace) {
          ActiveMQJMSBridgeLogger.LOGGER.trace("Pausing " + this);
@@ -556,6 +561,7 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
+   @Override
    public synchronized void resume() throws Exception {
       if (JMSBridgeImpl.trace) {
          ActiveMQJMSBridgeLogger.LOGGER.trace("Resuming " + this);
@@ -572,10 +578,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
+   @Override
    public DestinationFactory getSourceDestinationFactory() {
       return sourceDestinationFactory;
    }
 
+   @Override
    public void setSourceDestinationFactory(final DestinationFactory dest) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory");
@@ -583,10 +591,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       sourceDestinationFactory = dest;
    }
 
+   @Override
    public DestinationFactory getTargetDestinationFactory() {
       return targetDestinationFactory;
    }
 
+   @Override
    public void setTargetDestinationFactory(final DestinationFactory dest) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory");
@@ -594,60 +604,72 @@ public final class JMSBridgeImpl implements JMSBridge {
       targetDestinationFactory = dest;
    }
 
+   @Override
    public synchronized String getSourceUsername() {
       return sourceUsername;
    }
 
+   @Override
    public synchronized void setSourceUsername(final String name) {
       checkBridgeNotStarted();
 
       sourceUsername = name;
    }
 
+   @Override
    public synchronized String getSourcePassword() {
       return sourcePassword;
    }
 
+   @Override
    public synchronized void setSourcePassword(final String pwd) {
       checkBridgeNotStarted();
 
       sourcePassword = pwd;
    }
 
+   @Override
    public synchronized String getTargetUsername() {
       return targetUsername;
    }
 
+   @Override
    public synchronized void setTargetUsername(final String name) {
       checkBridgeNotStarted();
 
       targetUsername = name;
    }
 
+   @Override
    public synchronized String getTargetPassword() {
       return targetPassword;
    }
 
+   @Override
    public synchronized void setTargetPassword(final String pwd) {
       checkBridgeNotStarted();
 
       targetPassword = pwd;
    }
 
+   @Override
    public synchronized String getSelector() {
       return selector;
    }
 
+   @Override
    public synchronized void setSelector(final String selector) {
       checkBridgeNotStarted();
 
       this.selector = selector;
    }
 
+   @Override
    public synchronized long getFailureRetryInterval() {
       return failureRetryInterval;
    }
 
+   @Override
    public synchronized void setFailureRetryInterval(final long interval) {
       checkBridgeNotStarted();
       if (interval < 1) {
@@ -657,10 +679,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       failureRetryInterval = interval;
    }
 
+   @Override
    public synchronized int getMaxRetries() {
       return maxRetries;
    }
 
+   @Override
    public synchronized void setMaxRetries(final int retries) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkValidValue(retries, "MaxRetries");
@@ -668,10 +692,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       maxRetries = retries;
    }
 
+   @Override
    public synchronized QualityOfServiceMode getQualityOfServiceMode() {
       return qualityOfServiceMode;
    }
 
+   @Override
    public synchronized void setQualityOfServiceMode(final QualityOfServiceMode mode) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkNotNull(mode, "QualityOfServiceMode");
@@ -679,10 +705,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       qualityOfServiceMode = mode;
    }
 
+   @Override
    public synchronized int getMaxBatchSize() {
       return maxBatchSize;
    }
 
+   @Override
    public synchronized void setMaxBatchSize(final int size) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkMaxBatchSize(size);
@@ -690,10 +718,12 @@ public final class JMSBridgeImpl implements JMSBridge {
       maxBatchSize = size;
    }
 
+   @Override
    public synchronized long getMaxBatchTime() {
       return maxBatchTime;
    }
 
+   @Override
    public synchronized void setMaxBatchTime(final long time) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkValidValue(time, "MaxBatchTime");
@@ -701,41 +731,50 @@ public final class JMSBridgeImpl implements JMSBridge {
       maxBatchTime = time;
    }
 
+   @Override
    public synchronized String getSubscriptionName() {
       return subName;
    }
 
+   @Override
    public synchronized void setSubscriptionName(final String subname) {
       checkBridgeNotStarted();
       subName = subname;
    }
 
+   @Override
    public synchronized String getClientID() {
       return clientID;
    }
 
+   @Override
    public synchronized void setClientID(final String clientID) {
       checkBridgeNotStarted();
 
       this.clientID = clientID;
    }
 
+   @Override
    public boolean isAddMessageIDInHeader() {
       return addMessageIDInHeader;
    }
 
+   @Override
    public void setAddMessageIDInHeader(final boolean value) {
       addMessageIDInHeader = value;
    }
 
+   @Override
    public synchronized boolean isPaused() {
       return paused;
    }
 
+   @Override
    public synchronized boolean isFailed() {
       return failed;
    }
 
+   @Override
    public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory");
@@ -743,6 +782,7 @@ public final class JMSBridgeImpl implements JMSBridge {
       sourceCff = cff;
    }
 
+   @Override
    public synchronized void setTargetConnectionFactoryFactory(final ConnectionFactoryFactory cff) {
       checkBridgeNotStarted();
       JMSBridgeImpl.checkNotNull(cff, "TargetConnectionFactoryFactory");
@@ -750,6 +790,7 @@ public final class JMSBridgeImpl implements JMSBridge {
       targetCff = cff;
    }
 
+   @Override
    public void setTransactionManager(final TransactionManager tm) {
       this.tm = tm;
    }
@@ -1562,6 +1603,7 @@ public final class JMSBridgeImpl implements JMSBridge {
             final Thread thr = new Thread(r);
             if (moduleTccl != null) {
                AccessController.doPrivileged(new PrivilegedAction() {
+                  @Override
                   public Object run() {
                      thr.setContextClassLoader(moduleTccl);
                      return null;
@@ -1706,6 +1748,7 @@ public final class JMSBridgeImpl implements JMSBridge {
          }
       }
 
+      @Override
       public void run() {
          if (JMSBridgeImpl.trace) {
             ActiveMQJMSBridgeLogger.LOGGER.trace("Failure handler running");
@@ -1771,6 +1814,7 @@ public final class JMSBridgeImpl implements JMSBridge {
 
    private class BatchTimeChecker implements Runnable {
 
+      @Override
       public void run() {
          if (JMSBridgeImpl.trace) {
             ActiveMQJMSBridgeLogger.LOGGER.trace(this + " running");
@@ -1841,6 +1885,7 @@ public final class JMSBridgeImpl implements JMSBridge {
          this.isSource = isSource;
       }
 
+      @Override
       public void onException(final JMSException e) {
          if (stopping) {
             return;
@@ -1901,18 +1946,22 @@ public final class JMSBridgeImpl implements JMSBridge {
       }
    }
 
+   @Override
    public boolean isUseMaskedPassword() {
       return useMaskedPassword;
    }
 
+   @Override
    public void setUseMaskedPassword(boolean maskPassword) {
       this.useMaskedPassword = maskPassword;
    }
 
+   @Override
    public String getPasswordCodec() {
       return passwordCodec;
    }
 
+   @Override
    public void setPasswordCodec(String passwordCodec) {
       this.passwordCodec = passwordCodec;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
index 15e6a22..9a9d41a 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIConnectionFactoryFactory.java
@@ -26,6 +26,7 @@ public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements
       super(jndiProperties, lookup);
    }
 
+   @Override
    public Object createConnectionFactory() throws Exception {
       return createObject();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
index 3479267..93877f2 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JNDIDestinationFactory.java
@@ -28,6 +28,7 @@ public class JNDIDestinationFactory extends JNDIFactorySupport implements Destin
       super(jndiProperties, lookup);
    }
 
+   @Override
    public Destination createDestination() throws Exception {
       return (Destination) createObject();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
index efa1df5..15f165e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
@@ -61,308 +61,377 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
 
    // ManagedConnectionFactoryMBean implementation ------------------
 
+   @Override
    public String[] getRegistryBindings() {
       return jmsManager.getBindingsOnConnectionFactory(name);
    }
 
+   @Override
    public boolean isCompressLargeMessages() {
       return cf.isCompressLargeMessage();
    }
 
+   @Override
    public void setCompressLargeMessages(final boolean compress) {
       cfConfig.setCompressLargeMessages(compress);
       recreateCF();
    }
 
+   @Override
    public boolean isHA() {
       return cfConfig.isHA();
    }
 
+   @Override
    public int getFactoryType() {
       return cfConfig.getFactoryType().intValue();
    }
 
+   @Override
    public String getClientID() {
       return cfConfig.getClientID();
    }
 
+   @Override
    public long getClientFailureCheckPeriod() {
       return cfConfig.getClientFailureCheckPeriod();
    }
 
+   @Override
    public void setClientID(String clientID) {
       cfConfig.setClientID(clientID);
       recreateCF();
    }
 
+   @Override
    public void setDupsOKBatchSize(int dupsOKBatchSize) {
       cfConfig.setDupsOKBatchSize(dupsOKBatchSize);
       recreateCF();
    }
 
+   @Override
    public void setTransactionBatchSize(int transactionBatchSize) {
       cfConfig.setTransactionBatchSize(transactionBatchSize);
       recreateCF();
    }
 
+   @Override
    public void setClientFailureCheckPeriod(long clientFailureCheckPeriod) {
       cfConfig.setClientFailureCheckPeriod(clientFailureCheckPeriod);
       recreateCF();
    }
 
+   @Override
    public void setConnectionTTL(long connectionTTL) {
       cfConfig.setConnectionTTL(connectionTTL);
       recreateCF();
    }
 
+   @Override
    public void setCallTimeout(long callTimeout) {
       cfConfig.setCallTimeout(callTimeout);
       recreateCF();
    }
 
+   @Override
    public void setCallFailoverTimeout(long callTimeout) {
       cfConfig.setCallFailoverTimeout(callTimeout);
       recreateCF();
    }
 
+   @Override
    public void setConsumerWindowSize(int consumerWindowSize) {
       cfConfig.setConsumerWindowSize(consumerWindowSize);
       recreateCF();
    }
 
+   @Override
    public void setConsumerMaxRate(int consumerMaxRate) {
       cfConfig.setConsumerMaxRate(consumerMaxRate);
       recreateCF();
    }
 
+   @Override
    public void setConfirmationWindowSize(int confirmationWindowSize) {
       cfConfig.setConfirmationWindowSize(confirmationWindowSize);
       recreateCF();
    }
 
+   @Override
    public void setProducerMaxRate(int producerMaxRate) {
       cfConfig.setProducerMaxRate(producerMaxRate);
       recreateCF();
    }
 
+   @Override
    public int getProducerWindowSize() {
       return cfConfig.getProducerWindowSize();
    }
 
+   @Override
    public void setProducerWindowSize(int producerWindowSize) {
       cfConfig.setProducerWindowSize(producerWindowSize);
       recreateCF();
    }
 
+   @Override
    public void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient) {
       cfConfig.setCacheLargeMessagesClient(cacheLargeMessagesClient);
       recreateCF();
    }
 
+   @Override
    public boolean isCacheLargeMessagesClient() {
       return cfConfig.isCacheLargeMessagesClient();
    }
 
+   @Override
    public void setMinLargeMessageSize(int minLargeMessageSize) {
       cfConfig.setMinLargeMessageSize(minLargeMessageSize);
       recreateCF();
    }
 
+   @Override
    public void setBlockOnNonDurableSend(boolean blockOnNonDurableSend) {
       cfConfig.setBlockOnNonDurableSend(blockOnNonDurableSend);
       recreateCF();
    }
 
+   @Override
    public void setBlockOnAcknowledge(boolean blockOnAcknowledge) {
       cfConfig.setBlockOnAcknowledge(blockOnAcknowledge);
       recreateCF();
    }
 
+   @Override
    public void setBlockOnDurableSend(boolean blockOnDurableSend) {
       cfConfig.setBlockOnDurableSend(blockOnDurableSend);
       recreateCF();
    }
 
+   @Override
    public void setAutoGroup(boolean autoGroup) {
       cfConfig.setAutoGroup(autoGroup);
       recreateCF();
    }
 
+   @Override
    public void setPreAcknowledge(boolean preAcknowledge) {
       cfConfig.setPreAcknowledge(preAcknowledge);
       recreateCF();
    }
 
+   @Override
    public void setMaxRetryInterval(long retryInterval) {
       cfConfig.setMaxRetryInterval(retryInterval);
       recreateCF();
    }
 
+   @Override
    public void setRetryIntervalMultiplier(double retryIntervalMultiplier) {
       cfConfig.setRetryIntervalMultiplier(retryIntervalMultiplier);
       recreateCF();
    }
 
+   @Override
    public void setReconnectAttempts(int reconnectAttempts) {
       cfConfig.setReconnectAttempts(reconnectAttempts);
       recreateCF();
    }
 
+   @Override
    public void setFailoverOnInitialConnection(boolean failover) {
       cfConfig.setFailoverOnInitialConnection(failover);
       recreateCF();
    }
 
+   @Override
    public boolean isUseGlobalPools() {
       return cfConfig.isUseGlobalPools();
    }
 
+   @Override
    public void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize) {
       cfConfig.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
       recreateCF();
    }
 
+   @Override
    public int getThreadPoolMaxSize() {
       return cfConfig.getThreadPoolMaxSize();
    }
 
+   @Override
    public void setThreadPoolMaxSize(int threadPoolMaxSize) {
       cfConfig.setThreadPoolMaxSize(threadPoolMaxSize);
       recreateCF();
    }
 
+   @Override
    public int getInitialMessagePacketSize() {
       return cf.getInitialMessagePacketSize();
    }
 
+   @Override
    public void setGroupID(String groupID) {
       cfConfig.setGroupID(groupID);
       recreateCF();
    }
 
+   @Override
    public String getGroupID() {
       return cfConfig.getGroupID();
    }
 
+   @Override
    public void setUseGlobalPools(boolean useGlobalPools) {
       cfConfig.setUseGlobalPools(useGlobalPools);
       recreateCF();
    }
 
+   @Override
    public int getScheduledThreadPoolMaxSize() {
       return cfConfig.getScheduledThreadPoolMaxSize();
    }
 
+   @Override
    public void setRetryInterval(long retryInterval) {
       cfConfig.setRetryInterval(retryInterval);
       recreateCF();
    }
 
+   @Override
    public long getMaxRetryInterval() {
       return cfConfig.getMaxRetryInterval();
    }
 
+   @Override
    public String getConnectionLoadBalancingPolicyClassName() {
       return cfConfig.getLoadBalancingPolicyClassName();
    }
 
+   @Override
    public void setConnectionLoadBalancingPolicyClassName(String name) {
       cfConfig.setLoadBalancingPolicyClassName(name);
       recreateCF();
    }
 
+   @Override
    public TransportConfiguration[] getStaticConnectors() {
       return cf.getStaticConnectors();
    }
 
+   @Override
    public DiscoveryGroupConfiguration getDiscoveryGroupConfiguration() {
       return cf.getDiscoveryGroupConfiguration();
    }
 
+   @Override
    public void addBinding(@Parameter(name = "binding", desc = "the name of the binding for the Registry") String binding) throws Exception {
       jmsManager.addConnectionFactoryToBindingRegistry(name, binding);
    }
 
+   @Override
    public void removeBinding(@Parameter(name = "binding", desc = "the name of the binding for the Registry") String binding) throws Exception {
       jmsManager.removeConnectionFactoryFromBindingRegistry(name, binding);
    }
 
+   @Override
    public long getCallTimeout() {
       return cfConfig.getCallTimeout();
    }
 
+   @Override
    public long getCallFailoverTimeout() {
       return cfConfig.getCallFailoverTimeout();
    }
 
+   @Override
    public int getConsumerMaxRate() {
       return cfConfig.getConsumerMaxRate();
    }
 
+   @Override
    public int getConsumerWindowSize() {
       return cfConfig.getConsumerWindowSize();
    }
 
+   @Override
    public int getProducerMaxRate() {
       return cfConfig.getProducerMaxRate();
    }
 
+   @Override
    public int getConfirmationWindowSize() {
       return cfConfig.getConfirmationWindowSize();
    }
 
+   @Override
    public int getDupsOKBatchSize() {
       return cfConfig.getDupsOKBatchSize();
    }
 
+   @Override
    public boolean isBlockOnAcknowledge() {
       return cfConfig.isBlockOnAcknowledge();
    }
 
+   @Override
    public boolean isBlockOnNonDurableSend() {
       return cfConfig.isBlockOnNonDurableSend();
    }
 
+   @Override
    public boolean isBlockOnDurableSend() {
       return cfConfig.isBlockOnDurableSend();
    }
 
+   @Override
    public boolean isPreAcknowledge() {
       return cfConfig.isPreAcknowledge();
    }
 
+   @Override
    public String getName() {
       return name;
    }
 
+   @Override
    public long getConnectionTTL() {
       return cfConfig.getConnectionTTL();
    }
 
+   @Override
    public int getReconnectAttempts() {
       return cfConfig.getReconnectAttempts();
    }
 
+   @Override
    public boolean isFailoverOnInitialConnection() {
       return cfConfig.isFailoverOnInitialConnection();
    }
 
+   @Override
    public int getMinLargeMessageSize() {
       return cfConfig.getMinLargeMessageSize();
    }
 
+   @Override
    public long getRetryInterval() {
       return cfConfig.getRetryInterval();
    }
 
+   @Override
    public double getRetryIntervalMultiplier() {
       return cfConfig.getRetryIntervalMultiplier();
    }
 
+   @Override
    public int getTransactionBatchSize() {
       return cfConfig.getTransactionBatchSize();
    }
 
+   @Override
    public boolean isAutoGroup() {
       return cfConfig.isAutoGroup();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
index ff7a387..b64a14f 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
@@ -85,34 +85,42 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
 
    // ManagedJMSQueueMBean implementation ---------------------------
 
+   @Override
    public String getName() {
       return managedQueue.getName();
    }
 
+   @Override
    public String getAddress() {
       return managedQueue.getAddress();
    }
 
+   @Override
    public boolean isTemporary() {
       return managedQueue.isTemporary();
    }
 
+   @Override
    public long getMessageCount() {
       return coreQueueControl.getMessageCount();
    }
 
+   @Override
    public long getMessagesAdded() {
       return coreQueueControl.getMessagesAdded();
    }
 
+   @Override
    public int getConsumerCount() {
       return coreQueueControl.getConsumerCount();
    }
 
+   @Override
    public int getDeliveringCount() {
       return coreQueueControl.getDeliveringCount();
    }
 
+   @Override
    public long getScheduledCount() {
       return coreQueueControl.getScheduledCount();
    }
@@ -121,22 +129,27 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return coreQueueControl.isDurable();
    }
 
+   @Override
    public String getDeadLetterAddress() {
       return coreQueueControl.getDeadLetterAddress();
    }
 
+   @Override
    public String getExpiryAddress() {
       return coreQueueControl.getExpiryAddress();
    }
 
+   @Override
    public String getFirstMessageAsJSON() throws Exception {
       return coreQueueControl.getFirstMessageAsJSON();
    }
 
+   @Override
    public Long getFirstMessageTimestamp() throws Exception {
       return coreQueueControl.getFirstMessageTimestamp();
    }
 
+   @Override
    public Long getFirstMessageAge() throws Exception {
       return coreQueueControl.getFirstMessageAge();
    }
@@ -146,10 +159,12 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       jmsServerManager.addQueueToBindingRegistry(managedQueue.getName(), binding);
    }
 
+   @Override
    public String[] getRegistryBindings() {
       return jmsServerManager.getBindingsOnQueue(managedQueue.getName());
    }
 
+   @Override
    public boolean removeMessage(final String messageID) throws Exception {
       String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID);
       int removed = coreQueueControl.removeMessages(filter);
@@ -159,11 +174,13 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return true;
    }
 
+   @Override
    public int removeMessages(final String filterStr) throws Exception {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
       return coreQueueControl.removeMessages(filter);
    }
 
+   @Override
    public Map<String, Object>[] listMessages(final String filterStr) throws Exception {
       try {
          String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
@@ -224,15 +241,18 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return coreQueueControl.listDeliveringMessagesAsJSON();
    }
 
+   @Override
    public String listMessagesAsJSON(final String filter) throws Exception {
       return JMSQueueControlImpl.toJSON(listMessages(filter));
    }
 
+   @Override
    public long countMessages(final String filterStr) throws Exception {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
       return coreQueueControl.countMessages(filter);
    }
 
+   @Override
    public boolean expireMessage(final String messageID) throws Exception {
       String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID);
       int expired = coreQueueControl.expireMessages(filter);
@@ -242,11 +262,13 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return true;
    }
 
+   @Override
    public int expireMessages(final String filterStr) throws Exception {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
       return coreQueueControl.expireMessages(filter);
    }
 
+   @Override
    public boolean sendMessageToDeadLetterAddress(final String messageID) throws Exception {
       String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID);
       int dead = coreQueueControl.sendMessagesToDeadLetterAddress(filter);
@@ -256,11 +278,13 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return true;
    }
 
+   @Override
    public int sendMessagesToDeadLetterAddress(final String filterStr) throws Exception {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
       return coreQueueControl.sendMessagesToDeadLetterAddress(filter);
    }
 
+   @Override
    public boolean changeMessagePriority(final String messageID, final int newPriority) throws Exception {
       String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID);
       int changed = coreQueueControl.changeMessagesPriority(filter, newPriority);
@@ -270,11 +294,13 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return true;
    }
 
+   @Override
    public int changeMessagesPriority(final String filterStr, final int newPriority) throws Exception {
       String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
       return coreQueueControl.changeMessagesPriority(filter, newPriority);
    }
 
+   @Override
    public boolean retryMessage(final String jmsMessageID) throws Exception {
 
       // Figure out messageID from JMSMessageID.
@@ -289,15 +315,18 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return messageID != null && coreQueueControl.retryMessage(messageID);
    }
 
+   @Override
    public int retryMessages() throws Exception {
       return coreQueueControl.retryMessages();
    }
 
 
+   @Override
    public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception {
       return moveMessage(messageID, otherQueueName, false);
    }
 
+   @Override
    public boolean moveMessage(final String messageID,
                               final String otherQueueName,
                               final boolean rejectDuplicates) throws Exception {
@@ -311,6 +340,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return true;
    }
 
+   @Override
    public int moveMessages(final String filterStr,
                            final String otherQueueName,
                            final boolean rejectDuplicates) throws Exception {
@@ -319,15 +349,18 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       return coreQueueControl.moveMessages(filter, otherQueue.getAddress(), rejectDuplicates);
    }
 
+   @Override
    public int moveMessages(final String filterStr, final String otherQueueName) throws Exception {
       return moveMessages(filterStr, otherQueueName, false);
    }
 
+   @Override
    @Operation(desc = "List all the existent consumers on the Queue")
    public String listConsumersAsJSON() throws Exception {
       return coreQueueControl.listConsumersAsJSON();
    }
 
+   @Override
    public String listMessageCounter() {
       try {
          return MessageCounterInfo.toJSon(counter);
@@ -337,38 +370,47 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       }
    }
 
+   @Override
    public void resetMessageCounter() throws Exception {
       coreQueueControl.resetMessageCounter();
    }
 
+   @Override
    public String listMessageCounterAsHTML() {
       return MessageCounterHelper.listMessageCounterAsHTML(new MessageCounter[]{counter});
    }
 
+   @Override
    public String listMessageCounterHistory() throws Exception {
       return MessageCounterHelper.listMessageCounterHistory(counter);
    }
 
+   @Override
    public String listMessageCounterHistoryAsHTML() {
       return MessageCounterHelper.listMessageCounterHistoryAsHTML(new MessageCounter[]{counter});
    }
 
+   @Override
    public boolean isPaused() throws Exception {
       return coreQueueControl.isPaused();
    }
 
+   @Override
    public void pause() throws Exception {
       coreQueueControl.pause();
    }
 
+   @Override
    public void resume() throws Exception {
       coreQueueControl.resume();
    }
 
+   @Override
    public String getSelector() {
       return coreQueueControl.getFilter();
    }
 
+   @Override
    public void flushExecutor() {
       coreQueueControl.flushExecutor();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
index eacc91f..5c0aea8 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
@@ -143,6 +143,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
    /**
     * See the interface definition for the javadoc.
     */
+   @Override
    public void createConnectionFactory(String name,
                                        boolean ha,
                                        boolean useDiscovery,
@@ -284,6 +285,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
     * <br>
     * The ConnectionFactory is bound to the Registry for all the specified bindings Strings.
     */
+   @Override
    public void createConnectionFactory(String name,
                                        boolean ha,
                                        boolean useDiscovery,
@@ -293,10 +295,12 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       createConnectionFactory(name, ha, useDiscovery, cfType, toArray(connectors), toArray(bindings));
    }
 
+   @Override
    public boolean createQueue(final String name) throws Exception {
       return createQueue(name, null, null, true);
    }
 
+   @Override
    public boolean createQueue(final String name, final String bindings) throws Exception {
       return createQueue(name, bindings, null, true);
    }
@@ -306,6 +310,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return createQueue(name, bindings, selector, true);
    }
 
+   @Override
    public boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to create") String name,
                               @Parameter(name = "bindings", desc = "comma-separated list of Registry bindings (use '&comma;' if u need to use commas in your bindings name)") String bindings,
                               @Parameter(name = "selector", desc = "the jms selector") String selector,
@@ -322,10 +327,12 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean destroyQueue(final String name) throws Exception {
       return destroyQueue(name, false);
    }
 
+   @Override
    public boolean destroyQueue(final String name, final boolean removeConsumers) throws Exception {
       checkStarted();
 
@@ -339,10 +346,12 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean createTopic(String name) throws Exception {
       return createTopic(name, null);
    }
 
+   @Override
    public boolean createTopic(final String topicName, final String bindings) throws Exception {
       checkStarted();
 
@@ -356,10 +365,12 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean destroyTopic(final String name) throws Exception {
       return destroyTopic(name, true);
    }
 
+   @Override
    public boolean destroyTopic(final String name, final boolean removeConsumers) throws Exception {
       checkStarted();
 
@@ -373,6 +384,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public void destroyConnectionFactory(final String name) throws Exception {
       checkStarted();
 
@@ -386,16 +398,19 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean isStarted() {
       return server.isStarted();
    }
 
+   @Override
    public String getVersion() {
       checkStarted();
 
       return server.getVersion();
    }
 
+   @Override
    public String[] getQueueNames() {
       checkStarted();
 
@@ -415,6 +430,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String[] getTopicNames() {
       checkStarted();
 
@@ -434,6 +450,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String[] getConnectionFactoryNames() {
       checkStarted();
 
@@ -455,26 +472,31 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    // NotificationEmitter implementation ----------------------------
 
+   @Override
    public void removeNotificationListener(final NotificationListener listener,
                                           final NotificationFilter filter,
                                           final Object handback) throws ListenerNotFoundException {
       broadcaster.removeNotificationListener(listener, filter, handback);
    }
 
+   @Override
    public void removeNotificationListener(final NotificationListener listener) throws ListenerNotFoundException {
       broadcaster.removeNotificationListener(listener);
    }
 
+   @Override
    public void addNotificationListener(final NotificationListener listener,
                                        final NotificationFilter filter,
                                        final Object handback) throws IllegalArgumentException {
       broadcaster.addNotificationListener(listener, filter, handback);
    }
 
+   @Override
    public MBeanNotificationInfo[] getNotificationInfo() {
       return JMSServerControlImpl.getNotificationInfos();
    }
 
+   @Override
    public String[] listRemoteAddresses() throws Exception {
       checkStarted();
 
@@ -488,6 +510,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String[] listRemoteAddresses(final String ipAddress) throws Exception {
       checkStarted();
 
@@ -501,6 +524,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean closeConnectionsForAddress(final String ipAddress) throws Exception {
       checkStarted();
 
@@ -514,6 +538,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean closeConsumerConnectionsForAddress(final String address) throws Exception {
       checkStarted();
 
@@ -527,6 +552,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public boolean closeConnectionsForUser(final String userName) throws Exception {
       checkStarted();
 
@@ -540,6 +566,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String[] listConnectionIDs() throws Exception {
       checkStarted();
 
@@ -553,6 +580,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String listConnectionsAsJSON() throws Exception {
       checkStarted();
 
@@ -594,6 +622,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String listConsumersAsJSON(String connectionID) throws Exception {
       checkStarted();
 
@@ -624,6 +653,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String listAllConsumersAsJSON() throws Exception {
       checkStarted();
 
@@ -649,6 +679,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String[] listSessions(final String connectionID) throws Exception {
       checkStarted();
 
@@ -662,6 +693,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String listPreparedTransactionDetailsAsJSON() throws Exception {
       checkStarted();
 
@@ -675,6 +707,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       }
    }
 
+   @Override
    public String listPreparedTransactionDetailsAsHTML() throws Exception {
       checkStarted();
 
@@ -709,6 +742,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    // Inner classes -------------------------------------------------
 
+   @Override
    public String[] listTargetDestinations(String sessionID) throws Exception {
       String[] addresses = server.getActiveMQServer().getActiveMQServerControl().listTargetAddresses(sessionID);
       Map<String, DestinationControl> allDests = new HashMap<String, DestinationControl>();
@@ -735,6 +769,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return destinations.toArray(new String[0]);
    }
 
+   @Override
    public String getLastSentMessageID(String sessionID, String address) throws Exception {
       ServerSession session = server.getActiveMQServer().getSessionByID(sessionID);
       if (session != null) {
@@ -743,6 +778,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return null;
    }
 
+   @Override
    public String getSessionCreationTime(String sessionID) throws Exception {
       ServerSession session = server.getActiveMQServer().getSessionByID(sessionID);
       if (session != null) {
@@ -751,6 +787,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return null;
    }
 
+   @Override
    public String listSessionsAsJSON(final String connectionID) throws Exception {
       checkStarted();
 
@@ -772,6 +809,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return array.toString();
    }
 
+   @Override
    public String closeConnectionWithClientID(final String clientID) throws Exception {
       return server.getActiveMQServer().destroyConnectionWithSessionMetadata(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY, clientID);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
index 213f243..e7711ae 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
@@ -76,26 +76,32 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       jmsServerManager.addTopicToBindingRegistry(managedTopic.getName(), binding);
    }
 
+   @Override
    public String[] getRegistryBindings() {
       return jmsServerManager.getBindingsOnTopic(managedTopic.getName());
    }
 
+   @Override
    public String getName() {
       return managedTopic.getName();
    }
 
+   @Override
    public boolean isTemporary() {
       return managedTopic.isTemporary();
    }
 
+   @Override
    public String getAddress() {
       return managedTopic.getAddress();
    }
 
+   @Override
    public long getMessageCount() {
       return getMessageCount(DurabilityType.ALL);
    }
 
+   @Override
    public int getDeliveringCount() {
       List<QueueControl> queues = getQueues(DurabilityType.ALL);
       int count = 0;
@@ -105,6 +111,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       return count;
    }
 
+   @Override
    public long getMessagesAdded() {
       List<QueueControl> queues = getQueues(DurabilityType.ALL);
       int count = 0;
@@ -114,50 +121,62 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       return count;
    }
 
+   @Override
    public int getDurableMessageCount() {
       return getMessageCount(DurabilityType.DURABLE);
    }
 
+   @Override
    public int getNonDurableMessageCount() {
       return getMessageCount(DurabilityType.NON_DURABLE);
    }
 
+   @Override
    public int getSubscriptionCount() {
       return getQueues(DurabilityType.ALL).size();
    }
 
+   @Override
    public int getDurableSubscriptionCount() {
       return getQueues(DurabilityType.DURABLE).size();
    }
 
+   @Override
    public int getNonDurableSubscriptionCount() {
       return getQueues(DurabilityType.NON_DURABLE).size();
    }
 
+   @Override
    public Object[] listAllSubscriptions() {
       return listSubscribersInfos(DurabilityType.ALL);
    }
 
+   @Override
    public String listAllSubscriptionsAsJSON() throws Exception {
       return listSubscribersInfosAsJSON(DurabilityType.ALL);
    }
 
+   @Override
    public Object[] listDurableSubscriptions() {
       return listSubscribersInfos(DurabilityType.DURABLE);
    }
 
+   @Override
    public String listDurableSubscriptionsAsJSON() throws Exception {
       return listSubscribersInfosAsJSON(DurabilityType.DURABLE);
    }
 
+   @Override
    public Object[] listNonDurableSubscriptions() {
       return listSubscribersInfos(DurabilityType.NON_DURABLE);
    }
 
+   @Override
    public String listNonDurableSubscriptionsAsJSON() throws Exception {
       return listSubscribersInfosAsJSON(DurabilityType.NON_DURABLE);
    }
 
+   @Override
    public Map<String, Object>[] listMessagesForSubscription(final String queueName) throws Exception {
       QueueControl coreQueueControl = (QueueControl) managementService.getResource(ResourceNames.CORE_QUEUE + queueName);
       if (coreQueueControl == null) {
@@ -176,10 +195,12 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       return jmsMessages;
    }
 
+   @Override
    public String listMessagesForSubscriptionAsJSON(final String queueName) throws Exception {
       return JMSQueueControlImpl.toJSON(listMessagesForSubscription(queueName));
    }
 
+   @Override
    public int countMessagesForSubscription(final String clientID,
                                            final String subscriptionName,
                                            final String filterStr) throws Exception {
@@ -192,6 +213,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       return coreQueueControl.listMessages(filter).length;
    }
 
+   @Override
    public int removeMessages(final String filterStr) throws Exception {
       String filter = JMSTopicControlImpl.createFilterFromJMSSelector(filterStr);
       int count = 0;
@@ -206,6 +228,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       return count;
    }
 
+   @Override
    public void dropDurableSubscription(final String clientID, final String subscriptionName) throws Exception {
       String queueName = ActiveMQDestination.createQueueNameForDurableSubscription(true, clientID, subscriptionName);
       QueueControl coreQueueControl = (QueueControl) managementService.getResource(ResourceNames.CORE_QUEUE + queueName);
@@ -216,6 +239,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
       serverControl.destroyQueue(queueName);
    }
 
+   @Override
    public void dropAllSubscriptions() throws Exception {
       ActiveMQServerControl serverControl = (ActiveMQServerControl) managementService.getResource(ResourceNames.CORE_SERVER);
       String[] queues = addressControl.getQueueNames();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
index a1097fe..602f982 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
@@ -91,6 +91,7 @@ public class PersistedDestination implements EncodingSupport {
       return durable;
    }
 
+   @Override
    public int getEncodeSize() {
       return DataConstants.SIZE_BYTE +
          BufferHelper.sizeOfSimpleString(name) +
@@ -98,6 +99,7 @@ public class PersistedDestination implements EncodingSupport {
          DataConstants.SIZE_BOOLEAN;
    }
 
+   @Override
    public void encode(final ActiveMQBuffer buffer) {
       buffer.writeByte(type.getType());
       buffer.writeSimpleString(SimpleString.toSimpleString(name));
@@ -105,6 +107,7 @@ public class PersistedDestination implements EncodingSupport {
       buffer.writeBoolean(durable);
    }
 
+   @Override
    public void decode(final ActiveMQBuffer buffer) {
       type = PersistedType.getType(buffer.readByte());
       name = buffer.readSimpleString().toString();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index 7d7c37d..dc93149 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -114,6 +114,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       mapFactories.put(connectionFactory.getName(), connectionFactory);
    }
 
+   @Override
    public void deleteConnectionFactory(final String cfName) throws Exception {
       PersistedConnectionFactory oldCF = mapFactories.remove(cfName);
       if (oldCF != null) {
@@ -136,11 +137,13 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       destinations.put(new Pair<PersistedType, String>(destination.getType(), destination.getName()), destination);
    }
 
+   @Override
    public List<PersistedBindings> recoverPersistedBindings() throws Exception {
       ArrayList<PersistedBindings> list = new ArrayList<PersistedBindings>(mapBindings.values());
       return list;
    }
 
+   @Override
    public void addBindings(PersistedType type, String name, String... address) throws Exception {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
@@ -169,6 +172,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       jmsJournal.appendCommitRecord(tx, true);
    }
 
+   @Override
    public void deleteBindings(PersistedType type, String name, String address) throws Exception {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
@@ -196,6 +200,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       jmsJournal.appendCommitRecord(tx, true);
    }
 
+   @Override
    public void deleteBindings(PersistedType type, String name) throws Exception {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
@@ -206,6 +211,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       }
    }
 
+   @Override
    public void deleteDestination(final PersistedType type, final String name) throws Exception {
       PersistedDestination destination = destinations.remove(new Pair<PersistedType, String>(type, name));
       if (destination != null) {
@@ -233,6 +239,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       jmsJournal.stop();
    }
 
+   @Override
    public void load() throws Exception {
       mapFactories.clear();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
index 7f6bb88..879e7cb 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/JMSServerManager.java
@@ -40,6 +40,7 @@ public interface JMSServerManager extends ActiveMQComponent {
     *
     * @return true if the server us running
     */
+   @Override
    boolean isStarted();
 
    /**