http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
index 9427bd4..4f6122e 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
@@ -156,6 +156,7 @@ public class ThreeBrokerVirtualTopicNetworkTest extends 
JmsMultipleBrokersTestSu
       bridge.setDecreaseNetworkConsumerPriority(true);
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
index 2af86b9..31c4a8b 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
@@ -52,6 +52,7 @@ public class TopicProducerFlowControlTest extends TestCase 
implements MessageLis
 
    private BrokerService broker;
 
+   @Override
    protected void setUp() throws Exception {
       // Setup and start the broker
       broker = new BrokerService();
@@ -93,6 +94,7 @@ public class TopicProducerFlowControlTest extends TestCase 
implements MessageLis
       broker.setDestinationPolicy(pm);
    }
 
+   @Override
    protected void tearDown() throws Exception {
       broker.stop();
       broker.waitUntilStopped();
@@ -129,6 +131,7 @@ public class TopicProducerFlowControlTest extends TestCase 
implements MessageLis
       final MessageProducer producer = session.createProducer(destination);
 
       Thread producingThread = new Thread("Producing Thread") {
+         @Override
          public void run() {
             try {
                for (long i = 0; i < numMessagesToSend; i++) {
@@ -157,6 +160,7 @@ public class TopicProducerFlowControlTest extends TestCase 
implements MessageLis
       producingThread.start();
 
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return consumed.get() == numMessagesToSend;
          }
@@ -166,6 +170,7 @@ public class TopicProducerFlowControlTest extends TestCase 
implements MessageLis
       assertEquals("Didn't consume all messages", numMessagesToSend, 
consumed.get());
 
       assertTrue("Producer got blocked", Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return blockedCounter.get() > 0;
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
index 41c3553..0d86bbf 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
@@ -52,6 +52,7 @@ public class TopicRedeliverTest extends TestSupport {
       super(n);
    }
 
+   @Override
    protected void setUp() throws Exception {
       super.setUp();
       topic = true;
@@ -153,6 +154,7 @@ public class TopicRedeliverTest extends TestSupport {
       Connection connection = createConnection();
       final AtomicBoolean gotException = new AtomicBoolean();
       connection.setExceptionListener(new ExceptionListener() {
+         @Override
          public void onException(JMSException exception) {
             LOG.error("unexpected ex:" + exception);
             gotException.set(true);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.java
index 6c2fcf8..9bc8fe6 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.java
@@ -48,6 +48,7 @@ public class TopicSubscriptionSlowConsumerTest extends 
TestCase {
    private MessageConsumer consumer;
    private BrokerService brokerService;
 
+   @Override
    public void setUp() throws Exception {
 
       brokerService = createBroker();
@@ -90,6 +91,7 @@ public class TopicSubscriptionSlowConsumerTest extends 
TestCase {
 
    }
 
+   @Override
    public void tearDown() throws Exception {
       consumer.close();
       producer.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
index b910593..2421107 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
@@ -80,6 +80,7 @@ public final class TransactionRollbackOrderTest extends 
TestCase {
          int msgCount;
          int msgCommittedCount;
 
+         @Override
          public void onMessage(Message m) {
             try {
                msgCount++;
@@ -154,6 +155,7 @@ public final class TransactionRollbackOrderTest extends 
TestCase {
 
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (connection != null) {
          LOG.info("Closing the connection");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
index 5895842..e16b892 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
@@ -23,6 +23,7 @@ import javax.jms.DeliveryMode;
  */
 public class TransientQueueRedeliverTest extends TopicRedeliverTest {
 
+   @Override
    protected void setUp() throws Exception {
       super.setUp();
       topic = false;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
index 708d0aa..5524832 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
@@ -121,6 +121,7 @@ public class 
TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest extends JmsMultip
 
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
index 38f682a..e5d20f5 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
@@ -56,6 +56,7 @@ public class TwoBrokerMulticastQueueTest extends 
CombinationTestSupport {
       junit.textui.TestRunner.run(suite());
    }
 
+   @Override
    public void setUp() throws Exception {
       groupId = getClass().getName() + "-" + System.currentTimeMillis();
       System.setProperty("groupId", groupId);
@@ -63,6 +64,7 @@ public class TwoBrokerMulticastQueueTest extends 
CombinationTestSupport {
       super.setUp();
    }
 
+   @Override
    public void tearDown() throws Exception {
       if (brokers != null) {
          for (int i = 0; i < BROKER_COUNT; i++) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
index ef39719..6af1145 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.java
@@ -21,6 +21,7 @@ import org.apache.activemq.network.NetworkConnector;
 
 public class 
TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest extends 
AbstractTwoBrokerNetworkConnectorWildcardIncludedDestinationTestSupport {
 
+   @Override
    protected void addIncludedDestination(NetworkConnector nc) {
       
nc.addExcludedDestination(ActiveMQDestination.createDestination("local.>", 
ActiveMQDestination.QUEUE_TYPE));
       
nc.addExcludedDestination(ActiveMQDestination.createDestination("local.>", 
ActiveMQDestination.TOPIC_TYPE));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
index 9d1c4ef..42439ec 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.java
@@ -21,6 +21,7 @@ import org.apache.activemq.network.NetworkConnector;
 
 public class 
TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest extends 
AbstractTwoBrokerNetworkConnectorWildcardIncludedDestinationTestSupport {
 
+   @Override
    protected void addIncludedDestination(NetworkConnector nc) {
       
nc.addExcludedDestination(ActiveMQDestination.createDestination("local.>", 
ActiveMQDestination.QUEUE_TYPE));
       
nc.addExcludedDestination(ActiveMQDestination.createDestination("local.>", 
ActiveMQDestination.TOPIC_TYPE));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
index 24212ce..e779c4f 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
@@ -58,6 +58,7 @@ public class TwoBrokerNetworkLoadBalanceTest extends 
JmsMultipleBrokersTestSuppo
       final MessageIdList msgsB = getConsumerMessages("BrokerB", clientB);
 
       Wait.waitFor(new Wait.Condition() {
+         @Override
          public boolean isSatisified() throws Exception {
             return msgsA.getMessageCount() + msgsB.getMessageCount() == 6000;
          }
@@ -69,6 +70,7 @@ public class TwoBrokerNetworkLoadBalanceTest extends 
JmsMultipleBrokersTestSuppo
       assertTrue("B got is fair share: " + msgsB.getMessageCount(), 
msgsB.getMessageCount() > 2000);
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
index 90d3e0d..c8bf46d 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
@@ -29,6 +29,7 @@ public class TwoBrokerQueueSendReceiveTest extends 
TwoBrokerTopicSendReceiveTest
 
    private static final Logger LOG = 
LoggerFactory.getLogger(TwoBrokerQueueSendReceiveTest.class);
 
+   @Override
    protected void setUp() throws Exception {
       topic = false;
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
index 041c7b9..7091ab3 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.java
@@ -21,6 +21,7 @@ package org.apache.activemq.usecases;
  */
 public class TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest extends 
TwoBrokerTopicSendReceiveUsingTcpTest {
 
+   @Override
    protected void setUp() throws Exception {
       this.messageCount = 5000;
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
index 365f5c8..eae48d6 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
@@ -29,6 +29,7 @@ public class 
TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok
    BrokerService receiveBroker;
    BrokerService sendBroker;
 
+   @Override
    protected ActiveMQConnectionFactory createReceiverConnectionFactory() 
throws JMSException {
       try {
          receiveBroker = new BrokerService();
@@ -48,6 +49,7 @@ public class 
TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok
       }
    }
 
+   @Override
    protected ActiveMQConnectionFactory createSenderConnectionFactory() throws 
JMSException {
       try {
          sendBroker = new BrokerService();
@@ -67,6 +69,7 @@ public class 
TwoBrokerTopicSendReceiveUsingJavaConfigurationTest extends TwoBrok
       }
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       if (sendBroker != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
index 6ea5577..987a534 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
@@ -32,6 +32,7 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends 
TwoBrokerTopicSendRec
    private BrokerService receiverBroker;
    private BrokerService senderBroker;
 
+   @Override
    protected void setUp() throws Exception {
       BrokerFactoryBean brokerFactory;
 
@@ -46,6 +47,7 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends 
TwoBrokerTopicSendRec
       super.setUp();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
 
@@ -57,6 +59,7 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends 
TwoBrokerTopicSendRec
       }
    }
 
+   @Override
    protected ActiveMQConnectionFactory createReceiverConnectionFactory() 
throws JMSException {
       try {
          ActiveMQConnectionFactory fac = new 
ActiveMQConnectionFactory(((TransportConnector) 
receiverBroker.getTransportConnectors().get(0)).getConnectUri());
@@ -68,6 +71,7 @@ public class TwoBrokerTopicSendReceiveUsingTcpTest extends 
TwoBrokerTopicSendRec
       }
    }
 
+   @Override
    protected ActiveMQConnectionFactory createSenderConnectionFactory() throws 
JMSException {
       try {
          ActiveMQConnectionFactory fac = new 
ActiveMQConnectionFactory(((TransportConnector) 
senderBroker.getTransportConnectors().get(0)).getConnectUri());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.java
index b4d3df9..3852df7 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.java
@@ -178,6 +178,7 @@ public class 
TwoBrokerVirtualDestDinamicallyIncludedDestTest extends JmsMultiple
       return 
bi.broker.getDestination(destination).getDestinationStatistics().getMessages().getCount();
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
index 369cf3c..4abe687 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
@@ -177,6 +177,7 @@ public class TwoBrokerVirtualTopicForwardingTest extends 
JmsMultipleBrokersTestS
 
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
index 6270fb1..18c4477 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
@@ -25,14 +25,17 @@ import org.apache.activemq.ActiveMQConnectionFactory;
  */
 public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends 
TwoBrokerTopicSendReceiveTest {
 
+   @Override
    protected ActiveMQConnectionFactory createReceiverConnectionFactory() 
throws JMSException {
       return 
createConnectionFactory("org/apache/activemq/usecases/receiver-discovery.xml", 
"receiver", "vm://receiver");
    }
 
+   @Override
    protected ActiveMQConnectionFactory createSenderConnectionFactory() throws 
JMSException {
       return 
createConnectionFactory("org/apache/activemq/usecases/sender-discovery.xml", 
"sender", "vm://sender");
    }
 
+   @Override
    protected void setUp() throws Exception {
       System.setProperty("groupId", getClass().getName() + "-" + 
System.currentTimeMillis());
       messageCount = 100000;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoSecureBrokerRequestReplyTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoSecureBrokerRequestReplyTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoSecureBrokerRequestReplyTest.java
index 63525cd..3b1c6b3 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoSecureBrokerRequestReplyTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoSecureBrokerRequestReplyTest.java
@@ -33,6 +33,7 @@ public class TwoSecureBrokerRequestReplyTest extends 
JmsMultipleBrokersTestSuppo
 
    private static final Logger LOG = 
LoggerFactory.getLogger(TwoSecureBrokerRequestReplyTest.class);
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
index e5c287f..876da5c 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/UnlimitedEnqueueTest.java
@@ -109,6 +109,7 @@ public class UnlimitedEnqueueTest {
          this.numberOfMessages = n;
       }
 
+      @Override
       public void run() {
          ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory(brokerService.getVmConnectorURI());
          try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
index 3d5aa85..5ba78d0 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/VerifyNetworkConsumersDisconnectTest.java
@@ -241,6 +241,7 @@ public class VerifyNetworkConsumersDisconnectTest extends 
JmsMultipleBrokersTest
       }, timeout));
    }
 
+   @Override
    public void setUp() throws Exception {
       super.setAutoFail(true);
       super.setUp();
@@ -265,6 +266,7 @@ public class VerifyNetworkConsumersDisconnectTest extends 
JmsMultipleBrokersTest
       brokerService.setDestinationPolicy(policyMap);
    }
 
+   @Override
    public void uncaughtException(Thread t, Throwable e) {
       synchronized (unhandledExceptions) {
          unhandledExceptions.put(t, e);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ProducerThread.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ProducerThread.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ProducerThread.java
index 8fe00ba..b6dde36 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ProducerThread.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ProducerThread.java
@@ -36,6 +36,7 @@ public class ProducerThread extends Thread {
       this.sess = sess;
    }
 
+   @Override
    public void run() {
       MessageProducer producer = null;
       try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
index aa8da347..43a585f 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/util/ReflectionSupportTest.java
@@ -36,6 +36,7 @@ public class ReflectionSupportTest extends TestCase {
    List<ActiveMQDestination> nonFavorites = new 
ArrayList<ActiveMQDestination>();
    String nonFavoritesString = "[topic://test1]";
 
+   @Override
    public void setUp() {
       favorites.add(new ActiveMQQueue("test"));
       favorites.add(new ActiveMQTopic("test"));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
index 886cc04..b02f71a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
@@ -43,11 +43,13 @@ public class JDBCPersistenceAdapterXBeanConfigTest extends 
TestCase {
 
    }
 
+   @Override
    protected void setUp() throws Exception {
       brokerService = createBroker();
       brokerService.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (brokerService != null) {
          brokerService.stop();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
index 460dc85..9b22634 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
@@ -43,11 +43,13 @@ public class JDBCPersistenceXBeanConfigTest extends 
TestCase {
 
    }
 
+   @Override
    protected void setUp() throws Exception {
       brokerService = createBroker();
       brokerService.start();
    }
 
+   @Override
    protected void tearDown() throws Exception {
       if (brokerService != null) {
          brokerService.stop();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
index 516dd16..6a6c31a 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
@@ -22,6 +22,7 @@ package org.apache.activemq.xbean;
  */
 public class MultipleTestsWithEmbeddedBrokerAndPersistenceTest extends 
MultipleTestsWithEmbeddedBrokerTest {
 
+   @Override
    protected boolean isPersistent() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
index 724a4c3..5c08e61 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
@@ -45,6 +45,7 @@ public class MultipleTestsWithSpringFactoryBeanTest extends 
TestCase {
    public void test2() throws Exception {
    }
 
+   @Override
    protected void setUp() throws Exception {
       LOG.info("### starting up the test case: " + getName());
 
@@ -60,6 +61,7 @@ public class MultipleTestsWithSpringFactoryBeanTest extends 
TestCase {
       LOG.info("### started up the test case: " + getName());
    }
 
+   @Override
    protected void tearDown() throws Exception {
       connection.close();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
index 6ed4ce6..287b683 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
@@ -26,11 +26,13 @@ public class MultipleTestsWithSpringXBeanFactoryBeanTest 
extends MultipleTestsWi
 
    private ClassPathXmlApplicationContext context;
 
+   @Override
    protected BrokerService createBroker() throws Exception {
       context = new 
ClassPathXmlApplicationContext("org/apache/activemq/xbean/spring2.xml");
       return (BrokerService) context.getBean("broker");
    }
 
+   @Override
    protected void tearDown() throws Exception {
       super.tearDown();
       if (context != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
index 8236902..057cd1c 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
@@ -24,6 +24,7 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class MultipleTestsWithXBeanFactoryBeanTest extends 
MultipleTestsWithEmbeddedBrokerTest {
 
+   @Override
    protected BrokerService createBroker() throws Exception {
       BrokerFactoryBean factory = new BrokerFactoryBean();
       factory.setConfig(new 
ClassPathResource("org/apache/activemq/xbean/activemq2.xml"));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java
----------------------------------------------------------------------
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java
index f596d35..f4ae587 100644
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java
+++ 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanXmlTest.java
@@ -20,6 +20,7 @@ import org.apache.activemq.broker.SpringTest;
 
 public class XBeanXmlTest extends SpringTest {
 
+   @Override
    public void testSenderWithSpringXml() throws Exception {
       assertSenderConfig("org/apache/activemq/xbean/spring.xml");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
index 2a48be4..a60c251 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQMessageHandlerTest.java
@@ -53,6 +53,7 @@ import org.junit.runner.RunWith;
 @RunWith(BMUnitRunner.class)
 public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase {
 
+   @Override
    protected boolean usePersistence() {
       return true;
    }
@@ -248,6 +249,7 @@ public class ActiveMQMessageHandlerTest extends 
ActiveMQRATestBase {
          }
       }
 
+      @Override
       public void onMessage(Message message) {
          super.onMessage(message);
          //         try
@@ -279,6 +281,7 @@ public class ActiveMQMessageHandlerTest extends 
ActiveMQRATestBase {
       }
    }
 
+   @Override
    @Before
    public void setUp() throws Exception {
       resourceAdapter = null;
@@ -287,6 +290,7 @@ public class ActiveMQMessageHandlerTest extends 
ActiveMQRATestBase {
       DummyTMLocator.startTM();
    }
 
+   @Override
    @After
    public void tearDown() throws Exception {
       DummyTMLocator.stopTM();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
index 4629be3..946be53 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
@@ -153,6 +153,7 @@ public class ConcurrentDeliveryCancelTest extends 
JMSTestBase {
          List<Thread> threads = new LinkedList<Thread>();
 
          threads.add(new Thread("ConsumerCloser") {
+            @Override
             public void run() {
                try {
                   System.out.println(Thread.currentThread().getName() + " 
closing consumer");
@@ -166,6 +167,7 @@ public class ConcurrentDeliveryCancelTest extends 
JMSTestBase {
          });
 
          threads.add(new Thread("SessionCloser") {
+            @Override
             public void run() {
                for (ServerSession sess : serverSessions) {
                   System.out.println("Thread " + 
Thread.currentThread().getName() + " starting");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/InterruptedMessageHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/InterruptedMessageHandlerTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/InterruptedMessageHandlerTest.java
index 5858c45..4f44f0d 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/InterruptedMessageHandlerTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/InterruptedMessageHandlerTest.java
@@ -51,6 +51,7 @@ import org.junit.runner.RunWith;
 @RunWith(BMUnitRunner.class)
 public class InterruptedMessageHandlerTest extends ActiveMQRATestBase {
 
+   @Override
    protected boolean usePersistence() {
       return true;
    }
@@ -189,6 +190,7 @@ public class InterruptedMessageHandlerTest extends 
ActiveMQRATestBase {
          }
       }
 
+      @Override
       public void onMessage(Message message) {
          super.onMessage(message);
       }
@@ -209,6 +211,7 @@ public class InterruptedMessageHandlerTest extends 
ActiveMQRATestBase {
       }
    }
 
+   @Override
    @Before
    public void setUp() throws Exception {
       resourceAdapter = null;
@@ -217,6 +220,7 @@ public class InterruptedMessageHandlerTest extends 
ActiveMQRATestBase {
       DummyTMLocator.startTM();
    }
 
+   @Override
    @After
    public void tearDown() throws Exception {
       DummyTMLocator.stopTM();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
index 518bcd9..0372878 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
@@ -138,6 +138,7 @@ public class PagingLeakTest extends ActiveMQTestBase {
             this.maxConsumed = maxConsumed;
          }
 
+         @Override
          public void run() {
             try {
                session.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
index d7521cb..060fcf0 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailoverTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.extras.byteman;
 
 public class ScaleDownGroupedFailoverTest extends ScaleDownFailoverTest {
 
+   @Override
    protected boolean isGrouped() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
index a136eac..e5fac03 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ScaleDownGroupedFailureTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.extras.byteman;
 
 public class ScaleDownGroupedFailureTest extends ScaleDownFailureTest {
 
+   @Override
    protected boolean isGrouped() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
index ef8a6fa..462e9be 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
@@ -124,6 +124,7 @@ public class TimeoutXATest extends ActiveMQTestBase {
       final CountDownLatch latchStore = new CountDownLatch(1000);
 
       Thread storingThread = new Thread() {
+         @Override
          public void run() {
             try {
                for (int i = 0; i < 100000; i++) {
@@ -140,6 +141,7 @@ public class TimeoutXATest extends ActiveMQTestBase {
       removingTXEntered0.await();
 
       Thread t = new Thread() {
+         @Override
          public void run() {
             try {
                xaSession.getXAResource().rollback(xid);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
index dead469..e4317fb 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
@@ -208,6 +208,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
 
    protected void setUpAdministeredObjects() throws Exception {
       cff0LowProducerWindow = new ConnectionFactoryFactory() {
+         @Override
          public ConnectionFactory createConnectionFactory() throws Exception {
             ActiveMQConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
@@ -224,6 +225,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       };
 
       cff0 = new ConnectionFactoryFactory() {
+         @Override
          public ConnectionFactory createConnectionFactory() throws Exception {
             ActiveMQConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
@@ -239,6 +241,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       };
 
       cff0xa = new ConnectionFactoryFactory() {
+         @Override
          public Object createConnectionFactory() throws Exception {
             ActiveMQXAConnectionFactory cf = (ActiveMQXAConnectionFactory) 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
@@ -258,6 +261,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
 
       cff1 = new ConnectionFactoryFactory() {
 
+         @Override
          public ConnectionFactory createConnectionFactory() throws Exception {
             ActiveMQJMSConnectionFactory cf = (ActiveMQJMSConnectionFactory) 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY, params1));
 
@@ -273,6 +277,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
 
       cff1xa = new ConnectionFactoryFactory() {
 
+         @Override
          public XAConnectionFactory createConnectionFactory() throws Exception 
{
             ActiveMQXAConnectionFactory cf = (ActiveMQXAConnectionFactory) 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY, params1));
 
@@ -290,6 +295,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       cf1xa = (XAConnectionFactory) cff1xa.createConnectionFactory();
 
       sourceQueueFactory = new DestinationFactory() {
+         @Override
          public Destination createDestination() throws Exception {
             return (Destination) context0.lookup("/queue/sourceQueue");
          }
@@ -298,6 +304,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       sourceQueue = (Queue) sourceQueueFactory.createDestination();
 
       targetQueueFactory = new DestinationFactory() {
+         @Override
          public Destination createDestination() throws Exception {
             return (Destination) context1.lookup("/queue/targetQueue");
          }
@@ -306,6 +313,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       targetQueue = (Queue) targetQueueFactory.createDestination();
 
       sourceTopicFactory = new DestinationFactory() {
+         @Override
          public Destination createDestination() throws Exception {
             return (Destination) context0.lookup("/topic/sourceTopic");
          }
@@ -314,6 +322,7 @@ public abstract class BridgeTestBase extends 
ActiveMQTestBase {
       sourceTopic = (Topic) sourceTopicFactory.createDestination();
 
       localTargetQueueFactory = new DestinationFactory() {
+         @Override
          public Destination createDestination() throws Exception {
             return (Destination) context0.lookup("/queue/localTargetQueue");
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
index 75c0979..b1565d8 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
@@ -188,6 +188,7 @@ public abstract class ClusteredBridgeTestBase extends 
ActiveMQTestBase {
 
       public ConnectionFactoryFactory getConnectionFactoryFactory() {
          ConnectionFactoryFactory cff = new ConnectionFactoryFactory() {
+            @Override
             public ConnectionFactory createConnectionFactory() throws 
Exception {
                ActiveMQConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, 
liveConnector);
                cf.getServerLocator().setReconnectAttempts(-1);
@@ -201,6 +202,7 @@ public abstract class ClusteredBridgeTestBase extends 
ActiveMQTestBase {
       public DestinationFactory getDestinationFactory(final String queueName) {
 
          DestinationFactory destFactory = new DestinationFactory() {
+            @Override
             public Destination createDestination() throws Exception {
                return (Destination) liveContext.lookup("/queue/" + queueName);
             }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
index 6821a16..4705846 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeReconnectionTest.java
@@ -275,6 +275,7 @@ public class JMSBridgeReconnectionTest extends 
BridgeTestBase {
 
    private void performCrashAndReconnect(boolean restart) throws Exception {
       cff1xa = new ConnectionFactoryFactory() {
+         @Override
          public Object createConnectionFactory() throws Exception {
             ActiveMQXAConnectionFactory cf = (ActiveMQXAConnectionFactory) 
ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, new 
TransportConfiguration(INVM_CONNECTOR_FACTORY, params1));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
index f7f439d..9d13e29 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
@@ -1772,6 +1772,7 @@ public class JMSBridgeTest extends BridgeTestBase {
 
       Exception ex;
 
+      @Override
       public void run() {
          try {
             for (int i = 0; i < numMessages; i++) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
index d500f6b..a240c12 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
@@ -74,6 +74,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends 
ActiveMQRATestBase
    private volatile boolean playServerClosingSession = true;
    private volatile boolean playServerClosingConsumer = true;
 
+   @Override
    @Before
    public void setUp() throws Exception {
       nettyLocator = createNettyNonHALocator();
@@ -86,12 +87,14 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
       DummyTMLocator.startTM();
    }
 
+   @Override
    @After
    public void tearDown() throws Exception {
       DummyTMLocator.stopTM();
       super.tearDown();
    }
 
+   @Override
    protected boolean usePersistence() {
       return true;
    }
@@ -143,6 +146,7 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
       final int NUMBER_OF_MESSAGES = 1000;
 
       Thread producer = new Thread() {
+         @Override
          public void run() {
             try {
                ServerLocator locator = createInVMLocator(0);
@@ -182,6 +186,7 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
       final AtomicBoolean running = new AtomicBoolean(true);
 
       Thread buggerThread = new Thread() {
+         @Override
          public void run() {
             while (running.get()) {
                try {
@@ -342,6 +347,7 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
          isDeliveryTransacted = deliveryTransacted;
       }
 
+      @Override
       public MessageEndpoint createEndpoint(XAResource xaResource) throws 
UnavailableException {
          TestEndpoint retEnd = new TestEndpoint();
          if (xaResource != null) {
@@ -350,6 +356,7 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
          return retEnd;
       }
 
+      @Override
       public boolean isDeliveryTransacted(Method method) throws 
NoSuchMethodException {
          return isDeliveryTransacted;
       }
@@ -390,6 +397,7 @@ public class MDBMultipleHandlersServerDisconnectTest 
extends ActiveMQRATestBase
 
       }
 
+      @Override
       public void onMessage(Message message) {
          Integer value = 0;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
index ee2c67d..1d71598 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -658,6 +658,7 @@ public class JMSXDeliveryCountTest extends JMSTestBase {
          this.name = name;
       }
 
+      @Override
       public void run() {
          try {
             Message lastMessage = null;
@@ -705,38 +706,48 @@ public class JMSXDeliveryCountTest extends JMSTestBase {
       DummyXAResource() {
       }
 
+      @Override
       public void commit(final Xid arg0, final boolean arg1) throws 
XAException {
       }
 
+      @Override
       public void end(final Xid arg0, final int arg1) throws XAException {
       }
 
+      @Override
       public void forget(final Xid arg0) throws XAException {
       }
 
+      @Override
       public int getTransactionTimeout() throws XAException {
          return 0;
       }
 
+      @Override
       public boolean isSameRM(final XAResource arg0) throws XAException {
          return false;
       }
 
+      @Override
       public int prepare(final Xid arg0) throws XAException {
          return XAResource.XA_OK;
       }
 
+      @Override
       public Xid[] recover(final int arg0) throws XAException {
          return null;
       }
 
+      @Override
       public void rollback(final Xid arg0) throws XAException {
       }
 
+      @Override
       public boolean setTransactionTimeout(final int arg0) throws XAException {
          return false;
       }
 
+      @Override
       public void start(final Xid arg0, final int arg1) throws XAException {
 
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
index fbc975d..a594b15 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
@@ -1935,23 +1935,29 @@ public class XATest extends JMSTestBase {
          this.failOnPrepare = failOnPrepare;
       }
 
+      @Override
       public void commit(final Xid arg0, final boolean arg1) throws 
XAException {
       }
 
+      @Override
       public void end(final Xid arg0, final int arg1) throws XAException {
       }
 
+      @Override
       public void forget(final Xid arg0) throws XAException {
       }
 
+      @Override
       public int getTransactionTimeout() throws XAException {
          return 0;
       }
 
+      @Override
       public boolean isSameRM(final XAResource arg0) throws XAException {
          return false;
       }
 
+      @Override
       public int prepare(final Xid arg0) throws XAException {
          if (failOnPrepare) {
             throw new XAException(XAException.XAER_RMFAIL);
@@ -1959,17 +1965,21 @@ public class XATest extends JMSTestBase {
          return XAResource.XA_OK;
       }
 
+      @Override
       public Xid[] recover(final int arg0) throws XAException {
          return null;
       }
 
+      @Override
       public void rollback(final Xid arg0) throws XAException {
       }
 
+      @Override
       public boolean setTransactionTimeout(final int arg0) throws XAException {
          return false;
       }
 
+      @Override
       public void start(final Xid arg0, final int arg1) throws XAException {
 
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolManagerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolManagerTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolManagerTest.java
index 3768f8b..f00b6e6 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolManagerTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolManagerTest.java
@@ -50,6 +50,7 @@ public class HornetQProtocolManagerTest extends 
ActiveMQTestBase {
 
    ActiveMQServer server;
    EmbeddedJMS embeddedJMS;
+   @Override
    @Before
    public void setUp() throws Exception {
       super.setUp();
@@ -69,6 +70,7 @@ public class HornetQProtocolManagerTest extends 
ActiveMQTestBase {
       embeddedJMS.start();
    }
 
+   @Override
    public void tearDown() throws Exception {
       embeddedJMS.stop();
       super.tearDown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java
----------------------------------------------------------------------
diff --git 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java
 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java
index c4b17f6..7a33df1 100644
--- 
a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java
+++ 
b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/protocols/hornetq/HornetQProtocolTest.java
@@ -46,6 +46,7 @@ public class HornetQProtocolTest extends ActiveMQTestBase {
 
    private static final Logger LOG = 
LoggerFactory.getLogger(HornetQProtocolTest.class);
 
+   @Override
    @Before
    public void setUp() throws Exception {
       HashMap<String, Object> params = new HashMap<String, Object>();
@@ -62,6 +63,7 @@ public class HornetQProtocolTest extends ActiveMQTestBase {
    }
 
 
+   @Override
    @After
    public void tearDown() throws Exception {
       org.hornetq.core.client.impl.ServerLocatorImpl.clearThreadPools();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
index 0b74c36..626918a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
@@ -37,17 +37,21 @@ public class SimpleNotificationService implements 
NotificationService {
 
    // NotificationService implementation ----------------------------
 
+   @Override
    public void addNotificationListener(final NotificationListener listener) {
       listeners.add(listener);
    }
 
+   @Override
    public void enableNotifications(final boolean enable) {
    }
 
+   @Override
    public void removeNotificationListener(final NotificationListener listener) 
{
       listeners.remove(listener);
    }
 
+   @Override
    public void sendNotification(final Notification notification) throws 
Exception {
       for (NotificationListener listener : listeners) {
          listener.onNotification(notification);
@@ -68,6 +72,7 @@ public class SimpleNotificationService implements 
NotificationService {
 
       private final List<Notification> notifications = new 
ArrayList<Notification>();
 
+      @Override
       public void onNotification(final Notification notification) {
          System.out.println(">>>>>>>>" + notification);
          notifications.add(notification);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
index 79bf5b3..f6f68bf 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
@@ -110,6 +110,7 @@ public class AcknowledgeTest extends ActiveMQTestBase {
       cc.setMessageHandler(new MessageHandler() {
          int c = 0;
 
+         @Override
          public void onMessage(final ClientMessage message) {
             log.info("Got message " + c++);
             latch.countDown();
@@ -140,6 +141,7 @@ public class AcknowledgeTest extends ActiveMQTestBase {
       final CountDownLatch latch = new CountDownLatch(numMessages);
       session.start();
       cc.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                message.acknowledge();
@@ -257,6 +259,7 @@ public class AcknowledgeTest extends ActiveMQTestBase {
       final CountDownLatch latch = new CountDownLatch(numMessages);
       session.start();
       cc.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage message) {
             if (latch.getCount() == 1) {
                try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
index 701bc71..30d9e86 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ActiveMQCrashTest.java
@@ -67,6 +67,7 @@ public class ActiveMQCrashTest extends ActiveMQTestBase {
       ClientSession session = clientSessionFactory.createSession();
 
       session.setSendAcknowledgementHandler(new SendAcknowledgementHandler() {
+         @Override
          public void sendAcknowledged(final Message message) {
             ackReceived = true;
          }
@@ -95,6 +96,7 @@ public class ActiveMQCrashTest extends ActiveMQTestBase {
          this.server = server;
       }
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          ActiveMQCrashTest.log.info("AckInterceptor.intercept " + packet);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
index 1242002..11b8da5 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
@@ -192,6 +192,7 @@ public class AutoCreateJmsQueueTest extends JMSTestBase {
       server.getSecurityRepository().addMatch("#", roles);
    }
 
+   @Override
    protected boolean useSecurity() {
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
index 0866312..97e0a87 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
@@ -207,6 +207,7 @@ public class AutogroupIdTest extends ActiveMQTestBase {
          this.latch = latch;
       }
 
+      @Override
       public void onMessage(final ClientMessage message) {
          messagesReceived++;
          try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
index 5ff6b0f..def7fec 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CommitRollbackTest.java
@@ -172,6 +172,7 @@ public class CommitRollbackTest extends ActiveMQTestBase {
       final CountDownLatch latch = new CountDownLatch(numMessages);
       session.start();
       cc.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                message.acknowledge();
@@ -246,6 +247,7 @@ public class CommitRollbackTest extends ActiveMQTestBase {
          this.latch = latch;
       }
 
+      @Override
       public void onMessage(final ClientMessage message) {
          try {
             message.acknowledge();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
index 2f34455..14f8826 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConcurrentCreateDeleteProduceTest.java
@@ -54,6 +54,7 @@ public class ConcurrentCreateDeleteProduceTest extends 
ActiveMQTestBase {
 
    private static final int PAGE_SIZE = 10 * 1024;
 
+   @Override
    @Before
    public void setUp() throws Exception {
       super.setUp();
@@ -104,6 +105,7 @@ public class ConcurrentCreateDeleteProduceTest extends 
ActiveMQTestBase {
 
       volatile Throwable ex;
 
+      @Override
       public void run() {
          ClientSessionFactory factory;
          ClientSession session;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
index 704445d..5ac324b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
@@ -67,20 +67,24 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
       Assert.assertTrue(consumer.isClosed());
 
       expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new 
ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             consumer.receive();
          }
       });
 
       expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new 
ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             consumer.receiveImmediate();
          }
       });
 
       expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, new 
ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             consumer.setMessageHandler(new MessageHandler() {
+               @Override
                public void onMessage(final ClientMessage message) {
                }
             });
@@ -107,6 +111,7 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
       final CountDownLatch waitingToProceed = new CountDownLatch(1);
       class MyHandler implements MessageHandler {
 
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                received.countDown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
index 8d173ae..2b706c0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerStuckTest.java
@@ -78,6 +78,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase {
       final NettyConnection nettyConnection = (NettyConnection) 
remotingConnection.getTransportConnection();
 
       Thread tReceive = new Thread() {
+         @Override
          public void run() {
             boolean first = true;
             try {
@@ -162,6 +163,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase {
       final NettyConnection nettyConnection = (NettyConnection) 
remotingConnection.getTransportConnection();
 
       Thread tReceive = new Thread() {
+         @Override
          public void run() {
             boolean first = true;
             try {
@@ -187,6 +189,7 @@ public class ConsumerStuckTest extends ActiveMQTestBase {
       tReceive.start();
 
       Thread sender = new Thread() {
+         @Override
          public void run() {
             try (
                ServerLocator locator = createNettyNonHALocator();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
index bb976f3..cf404c8 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
@@ -250,6 +250,7 @@ public class ConsumerTest extends ActiveMQTestBase {
       sf.close();
       final CountDownLatch latch = new CountDownLatch(numMessages);
       server.getRemotingService().addIncomingInterceptor(new Interceptor() {
+         @Override
          public boolean intercept(final Packet packet, final 
RemotingConnection connection) throws ActiveMQException {
             if (packet.getType() == PacketImpl.SESS_ACKNOWLEDGE) {
                latch.countDown();
@@ -262,6 +263,7 @@ public class ConsumerTest extends ActiveMQTestBase {
       ClientSession sessionRec = sfReceive.createSession(false, true, true);
       ClientConsumer consumer = sessionRec.createConsumer(QUEUE);
       consumer.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                message.acknowledge();
@@ -327,6 +329,7 @@ public class ConsumerTest extends ActiveMQTestBase {
       ClientConsumer consumer = session.createConsumer(QUEUE);
 
       consumer.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage msg) {
          }
       });
@@ -348,6 +351,7 @@ public class ConsumerTest extends ActiveMQTestBase {
       ClientConsumer consumer = session.createConsumer(QUEUE);
 
       consumer.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage msg) {
          }
       });
@@ -398,6 +402,7 @@ public class ConsumerTest extends ActiveMQTestBase {
          {
 
             consumer.setMessageHandler(new MessageHandler() {
+               @Override
                public void onMessage(final ClientMessage msg) {
                   try {
                      ServerLocator locatorSendx = 
createFactory(isNetty()).setReconnectAttempts(-1);
@@ -440,6 +445,7 @@ public class ConsumerTest extends ActiveMQTestBase {
       }
 
       Thread tCons = new Thread() {
+         @Override
          public void run() {
             try {
                final ServerLocator locatorSend = createFactory(isNetty());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
index 4166d47..f68f5a6 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerWindowSizeTest.java
@@ -318,6 +318,7 @@ public class ConsumerWindowSizeTest extends 
ActiveMQTestBase {
 
       for (int i = 0; i < threads.length; i++) {
          threads[i] = new Thread() {
+            @Override
             public void run() {
                try {
                   ClientSession session = sf.createSession(false, false);
@@ -1050,6 +1051,7 @@ public class ConsumerWindowSizeTest extends 
ActiveMQTestBase {
             /* (non-Javadoc)
              * @see MessageHandler#onMessage(ClientMessage)
              */
+            @Override
             public synchronized void onMessage(final ClientMessage message) {
                try {
                   String str = getTextMessage(message);
@@ -1192,6 +1194,7 @@ public class ConsumerWindowSizeTest extends 
ActiveMQTestBase {
             /* (non-Javadoc)
              * @see MessageHandler#onMessage(ClientMessage)
              */
+            @Override
             public synchronized void onMessage(final ClientMessage message) {
                try {
                   log.info("received msg " + message);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
index 1a76ff4..89764ba 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeadLetterAddressTest.java
@@ -180,6 +180,7 @@ public class DeadLetterAddressTest extends ActiveMQTestBase 
{
          this.clientSession = clientSession;
       }
 
+      @Override
       public void onMessage(ClientMessage message) {
          count++;
          latch.countDown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
index 5cbe1c8..9fb960b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DeliveryOrderTest.java
@@ -158,6 +158,7 @@ public class DeliveryOrderTest extends ActiveMQTestBase {
          this.latch = latch;
       }
 
+      @Override
       public void onMessage(final ClientMessage message) {
          int i = message.getBodyBuffer().readInt();
          try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
index aafb79e..d74186f 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FailureDeadlockTest.java
@@ -81,6 +81,7 @@ public class FailureDeadlockTest extends ActiveMQTestBase {
          RemotingConnection rc2 = ((ClientSessionInternal) ((ActiveMQSession) 
sess2).getCoreSession()).getConnection();
 
          ExceptionListener listener1 = new ExceptionListener() {
+            @Override
             public void onException(final JMSException exception) {
                try {
                   conn2.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index 3ecee46..c38f8a6 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -483,6 +483,7 @@ public class HangConsumerTest extends ActiveMQTestBase {
          targetCallback.sendProducerCreditsMessage(credits, address);
       }
 
+      @Override
       public void sendProducerCreditsFailMessage(int credits, SimpleString 
address) {
          targetCallback.sendProducerCreditsFailMessage(credits, address);
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index 1b80ec6..509429d 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -496,6 +496,7 @@ public class InterruptedLargeMessageTest extends 
LargeMessageTestBase {
             this.execFactory = execFactory;
          }
 
+         @Override
          public Queue createQueue(long persistenceID,
                                   SimpleString address,
                                   SimpleString name,
@@ -512,6 +513,7 @@ public class InterruptedLargeMessageTest extends 
LargeMessageTestBase {
          /* (non-Javadoc)
           * @see 
org.apache.activemq.artemis.core.server.QueueFactory#setPostOffice(org.apache.activemq.artemis.core.postoffice.PostOffice)
           */
+         @Override
          public void setPostOffice(PostOffice postOffice) {
          }
 

Reply via email to