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/LargeMessageTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index 28f6f14..00841fe 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -141,6 +141,7 @@ public class LargeMessageTest extends LargeMessageTestBase {
       consumer.setMessageHandler(new MessageHandler() {
          int counter = 0;
 
+         @Override
          public void onMessage(ClientMessage message) {
             message.getBodyBuffer().readByte();
             // System.out.println("message:" + 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/MessageConcurrencyTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
index 5cd6f58..362f409 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConcurrencyTest.java
@@ -154,6 +154,7 @@ public class MessageConcurrencyTest extends 
ActiveMQTestBase {
       }
 
       consumer.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(ClientMessage message) {
             for (Sender sender : senders) {
                sender.queue.add(message);
@@ -206,6 +207,7 @@ public class MessageConcurrencyTest extends 
ActiveMQTestBase {
 
       volatile boolean failed;
 
+      @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/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
index fb07dc8..7de970d 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
@@ -47,6 +47,7 @@ public class MessageConsumerRollbackTest extends 
ActiveMQTestBase {
 
    private static final String outQueue = "outQueue";
 
+   @Override
    @Before
    public void setUp() throws Exception {
       super.setUp();
@@ -199,6 +200,7 @@ public class MessageConsumerRollbackTest extends 
ActiveMQTestBase {
          session.start();
       }
 
+      @Override
       public void onMessage(ClientMessage message) {
 
          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/MessageDurabilityTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
index 101383d..37a1fe9 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
@@ -142,6 +142,7 @@ public class MessageDurabilityTest extends ActiveMQTestBase 
{
       session.start();
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST,
 new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createConsumer(queue);
          }
@@ -167,6 +168,7 @@ public class MessageDurabilityTest extends ActiveMQTestBase 
{
 
       session.start();
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST,
 new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createConsumer(queue);
          }

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/MessageGroupingConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
index b468c98..c4356c7 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingConnectionFactoryTest.java
@@ -129,6 +129,7 @@ public class MessageGroupingConnectionFactoryTest extends 
ActiveMQTestBase {
          this.acknowledge = acknowledge;
       }
 
+      @Override
       public void onMessage(final ClientMessage message) {
          list.add(message);
          if (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/MessageGroupingTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
index ab12ff2..4aaaa0b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageGroupingTest.java
@@ -560,6 +560,7 @@ public class MessageGroupingTest extends ActiveMQTestBase {
          this.acknowledge = acknowledge;
       }
 
+      @Override
       public void onMessage(final ClientMessage message) {
          list.add(message);
          if (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/MessageHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
index 66aad72..f73403a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageHandlerTest.java
@@ -88,6 +88,7 @@ public class MessageHandlerTest extends ActiveMQTestBase {
 
       class MyHandler implements MessageHandler {
 
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                Thread.sleep(10);
@@ -156,6 +157,7 @@ public class MessageHandlerTest extends ActiveMQTestBase {
             this.latch = latch;
          }
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             try {
@@ -248,6 +250,7 @@ public class MessageHandlerTest extends ActiveMQTestBase {
             this.latch = latch;
          }
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             try {
@@ -327,6 +330,7 @@ public class MessageHandlerTest extends ActiveMQTestBase {
             this.latch = latch;
          }
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             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/MessageRateTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
index f40f6ed..c581f1a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
@@ -172,6 +172,7 @@ public class MessageRateTest extends ActiveMQTestBase {
 
       consumer.setMessageHandler(new MessageHandler() {
 
+         @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/MultipleThreadFilterOneTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
index 41dde10..e8015be 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
@@ -79,6 +79,7 @@ public class MultipleThreadFilterOneTest extends 
ActiveMQTestBase {
          sendMessages(numberOfMessages / 2);
       }
 
+      @Override
       public void run() {
          try {
             sendMessages(numberOfMessages / 2);
@@ -144,6 +145,7 @@ public class MultipleThreadFilterOneTest extends 
ActiveMQTestBase {
          this.nr = nr;
       }
 
+      @Override
       public void run() {
          try {
             consumerSession.start();

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/NIOvsOIOTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
index 1848e43..460b581 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
@@ -268,6 +268,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase {
 
       private int count;
 
+      @Override
       public void onMessage(ClientMessage msg) {
          try {
             msg.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/PagingTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
index 6204973..f97546a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
@@ -3268,6 +3268,7 @@ public class PagingTest extends ActiveMQTestBase {
 
          int count;
 
+         @Override
          public void onMessage(ClientMessage message1) {
             try {
                Thread.sleep(1);
@@ -4835,6 +4836,7 @@ public class PagingTest extends ActiveMQTestBase {
 
             consumerQ3.setMessageHandler(new MessageHandler() {
 
+               @Override
                public void onMessage(ClientMessage message) {
                   System.out.println("Received an unexpected message");
                   consumerQ3Msgs.incrementAndGet();
@@ -5463,39 +5465,49 @@ public class PagingTest extends ActiveMQTestBase {
          this.pageUp = pageUp;
       }
 
+      @Override
       public void onError(int errorCode, String errorMessage) {
       }
 
+      @Override
       public void done() {
       }
 
+      @Override
       public void storeLineUp() {
       }
 
+      @Override
       public boolean waitCompletion(long timeout) throws Exception {
          return false;
       }
 
+      @Override
       public void waitCompletion() throws Exception {
 
       }
 
+      @Override
       public void replicationLineUp() {
 
       }
 
+      @Override
       public void replicationDone() {
 
       }
 
+      @Override
       public void pageSyncLineUp() {
          pageUp.countDown();
       }
 
+      @Override
       public void pageSyncDone() {
          pageDone.countDown();
       }
 
+      @Override
       public void executeOnCompletion(IOCallback runnable) {
 
       }

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/ProducerCloseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
index 9f1e9b2..324ab17 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
@@ -48,6 +48,7 @@ public class ProducerCloseTest extends ActiveMQTestBase {
       Assert.assertTrue(producer.isClosed());
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             producer.send(session.createMessage(false));
          }

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/ProducerFlowControlTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
index 2567d68..093206d 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerFlowControlTest.java
@@ -226,6 +226,7 @@ public class ProducerFlowControlTest extends 
ActiveMQTestBase {
 
          volatile Exception exception;
 
+         @Override
          public void onMessage(final ClientMessage message) {
             try {
                byte[] bytesRead = new byte[messageSize];
@@ -341,6 +342,7 @@ public class ProducerFlowControlTest extends 
ActiveMQTestBase {
       final AtomicBoolean closed = new AtomicBoolean(false);
 
       Thread t = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                Thread.sleep(500);

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/ProducerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
index d5eea12..69285a4 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
@@ -59,6 +59,7 @@ public class ProducerTest extends ActiveMQTestBase {
    public void testProducerWithSmallWindowSizeAndLargeMessage() throws 
Exception {
       final CountDownLatch latch = new CountDownLatch(1);
       server.getRemotingService().addIncomingInterceptor(new Interceptor() {
+         @Override
          public boolean intercept(final Packet packet, final 
RemotingConnection connection) throws ActiveMQException {
             if (packet.getType() == PacketImpl.SESS_SEND) {
                latch.countDown();
@@ -97,6 +98,7 @@ public class ProducerTest extends ActiveMQTestBase {
          final ClientSession session = cf.createSession(false, true, true);
 
          Thread t = new Thread() {
+            @Override
             public void run() {
                try {
                   ClientProducer producer = session.createProducer();

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/ReceiveImmediateTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
index 6a310c6..c025174 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveImmediateTest.java
@@ -170,6 +170,7 @@ public class ReceiveImmediateTest extends ActiveMQTestBase {
       final AtomicBoolean receivedAsync = new AtomicBoolean(false);
 
       consumer.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(ClientMessage message) {
             receivedAsync.set(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/ReceiveTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
index 6ebc41f..08fd1b8 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java
@@ -113,6 +113,7 @@ public class ReceiveTest extends ActiveMQTestBase {
       ClientConsumer cc = session.createConsumer(queueA);
       session.start();
       cc.setMessageHandler(new MessageHandler() {
+         @Override
          public void onMessage(final ClientMessage 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/RedeliveryConsumerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
index aeb0764..e5a52bd 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
@@ -273,21 +273,26 @@ public class RedeliveryConsumerTest extends 
ActiveMQTestBase {
       journal.start();
       journal.load(new LoaderCallback() {
 
+         @Override
          public void failedTransaction(long transactionID, List<RecordInfo> 
records, List<RecordInfo> recordsToDelete) {
          }
 
+         @Override
          public void updateRecord(RecordInfo info) {
             if (info.userRecordType == JournalRecordIds.UPDATE_DELIVERY_COUNT) 
{
                updates.incrementAndGet();
             }
          }
 
+         @Override
          public void deleteRecord(long id) {
          }
 
+         @Override
          public void addRecord(RecordInfo info) {
          }
 
+         @Override
          public void addPreparedTransaction(PreparedTransactionInfo 
preparedTransaction) {
          }
       });

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/RequestorTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
index e087fa8..4c72f41 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RequestorTest.java
@@ -166,6 +166,7 @@ public class RequestorTest extends ActiveMQTestBase {
       ClientConsumer requestConsumer = session.createConsumer(requestQueue);
       requestConsumer.setMessageHandler(new MessageHandler() {
          // return a message with the negative request's value
+         @Override
          public void onMessage(final ClientMessage request) {
             // do nothing -> no reply
          }
@@ -190,6 +191,7 @@ public class RequestorTest extends ActiveMQTestBase {
       session.close();
 
       ActiveMQAction activeMQAction = new ActiveMQAction() {
+         @Override
          public void run() throws Exception {
             new ClientRequestor(session, requestAddress);
          }
@@ -229,6 +231,7 @@ public class RequestorTest extends ActiveMQTestBase {
       requestor.close();
 
       ActiveMQAction activeMQAction = new ActiveMQAction() {
+         @Override
          public void run() throws Exception {
             requestor.request(session.createMessage(false), 500);
          }
@@ -258,6 +261,7 @@ public class RequestorTest extends ActiveMQTestBase {
          this.session = session;
       }
 
+      @Override
       public void onMessage(final ClientMessage request) {
          try {
             ClientMessage reply = session.createMessage(false);

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/ServerLocatorConnectTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
index 21711c7..ea91ccd 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ServerLocatorConnectTest.java
@@ -161,6 +161,7 @@ public class ServerLocatorConnectTest extends 
ActiveMQTestBase {
          this.latch = latch;
       }
 
+      @Override
       public void run() {
          try {
             csf = locator.connect();

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/SessionCloseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
index 90d9cdd..db73b84 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
@@ -61,60 +61,70 @@ public class SessionCloseTest extends ActiveMQTestBase {
       Assert.assertTrue(session.isClosed());
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createProducer();
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createConsumer(RandomUtil.randomSimpleString());
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createQueue(RandomUtil.randomSimpleString(), 
RandomUtil.randomSimpleString(), RandomUtil.randomBoolean());
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createTemporaryQueue(RandomUtil.randomSimpleString(), 
RandomUtil.randomSimpleString());
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.start();
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.stop();
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.commit();
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.rollback();
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.queueQuery(RandomUtil.randomSimpleString());
          }
       });
 
       
ActiveMQTestBase.expectActiveMQException(ActiveMQExceptionType.OBJECT_CLOSED, 
new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.addressQuery(RandomUtil.randomSimpleString());
          }
@@ -133,42 +143,49 @@ public class SessionCloseTest extends ActiveMQTestBase {
       Assert.assertTrue(session.isClosed());
 
       ActiveMQTestBase.expectXAException(XAException.XA_RETRY, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.commit(RandomUtil.randomXid(), RandomUtil.randomBoolean());
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.end(RandomUtil.randomXid(), XAResource.TMSUCCESS);
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.forget(RandomUtil.randomXid());
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.prepare(RandomUtil.randomXid());
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.recover(XAResource.TMSTARTRSCAN);
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.rollback(RandomUtil.randomXid());
          }
       });
 
       ActiveMQTestBase.expectXAException(XAException.XAER_RMFAIL, new 
ActiveMQAction() {
+         @Override
          public void run() throws XAException {
             session.start(RandomUtil.randomXid(), XAResource.TMNOFLAGS);
          }

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/SessionSendAcknowledgementHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
index 09be52e..689446e 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
@@ -62,6 +62,7 @@ public class SessionSendAcknowledgementHandlerTest extends 
ActiveMQTestBase {
       boolean failed = false;
       try {
          session.setSendAcknowledgementHandler(new 
SendAcknowledgementHandler() {
+            @Override
             public void sendAcknowledged(Message 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/SessionStopStartTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
index 9b6fffa..3d8eff6 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionStopStartTest.java
@@ -176,6 +176,7 @@ public class SessionStopStartTest extends ActiveMQTestBase {
 
          int count = 0;
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             try {
@@ -256,6 +257,7 @@ public class SessionStopStartTest extends ActiveMQTestBase {
 
          boolean started = true;
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             try {
@@ -359,6 +361,7 @@ public class SessionStopStartTest extends ActiveMQTestBase {
             this.stop = stop;
          }
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             try {
@@ -453,6 +456,7 @@ public class SessionStopStartTest extends ActiveMQTestBase {
             this.stop = stop;
          }
 
+         @Override
          public void onMessage(final ClientMessage message) {
 
             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/SessionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
index f4645df..f85fe84 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
@@ -94,6 +94,7 @@ public class SessionTest extends ActiveMQTestBase {
                connectionFailed(me, failedOver);
             }
 
+            @Override
             public void beforeReconnect(final ActiveMQException me) {
             }
          }

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/TemporaryQueueTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 380b664..ea2df2b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -174,6 +174,7 @@ public class TemporaryQueueTest extends 
SingleServerTestBase {
 
       final CountDownLatch latch = new CountDownLatch(1);
       conn.addCloseListener(new CloseListener() {
+         @Override
          public void connectionClosed() {
             latch.countDown();
          }
@@ -367,6 +368,7 @@ public class TemporaryQueueTest extends 
SingleServerTestBase {
             return latch.await(10, TimeUnit.SECONDS);
          }
 
+         @Override
          public void onMessage(ClientMessage message) {
             try {
                message.acknowledge();
@@ -458,6 +460,7 @@ public class TemporaryQueueTest extends 
SingleServerTestBase {
       final CountDownLatch pingOnServerLatch = new CountDownLatch(1);
       server.getRemotingService().addIncomingInterceptor(new Interceptor() {
 
+         @Override
          public boolean intercept(final Packet packet, final 
RemotingConnection connection) throws ActiveMQException {
             if (packet.getType() == PacketImpl.PING) {
                pingOnServerLatch.countDown();
@@ -478,6 +481,7 @@ public class TemporaryQueueTest extends 
SingleServerTestBase {
       RemotingConnection remotingConnection = 
server.getRemotingService().getConnections().iterator().next();
       final CountDownLatch serverCloseLatch = new CountDownLatch(1);
       remotingConnection.addCloseListener(new CloseListener() {
+         @Override
          public void connectionClosed() {
             serverCloseLatch.countDown();
          }
@@ -505,6 +509,7 @@ public class TemporaryQueueTest extends 
SingleServerTestBase {
       session.start();
 
       ActiveMQAction activeMQAction = new ActiveMQAction() {
+         @Override
          public void run() throws ActiveMQException {
             session.createConsumer(queue);
          }

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/TransientQueueTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
index beea77e..f75539a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TransientQueueTest.java
@@ -200,6 +200,7 @@ public class TransientQueueTest extends 
SingleServerTestBase {
       assertTrue(exHappened);
    }
 
+   @Override
    protected ServerLocator createLocator() {
       return 
super.createLocator().setConsumerWindowSize(0).setBlockOnAcknowledge(true).setBlockOnDurableSend(false).setBlockOnNonDurableSend(false);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
index 79d2de5..cb21023 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptor.java
@@ -45,6 +45,7 @@ public class DummyInterceptor implements Interceptor {
       syncCounter.set(0);
    }
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
conn) throws ActiveMQException {
       log.debug("DummyFilter packet = " + packet.getClass().getName());
       syncCounter.addAndGet(1);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
index 4640c38..998e3b4 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/DummyInterceptorB.java
@@ -38,6 +38,7 @@ public class DummyInterceptorB implements Interceptor {
       DummyInterceptorB.syncCounter.set(0);
    }
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
conn) throws ActiveMQException {
       DummyInterceptorB.syncCounter.addAndGet(1);
       log.debug("DummyFilter packet = " + 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/cluster/NodeManagerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
index e9be8bd..c5f0917 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/NodeManagerTest.java
@@ -167,6 +167,7 @@ public class NodeManagerTest extends ActiveMQTestBase {
          this.action = action;
       }
 
+      @Override
       public void run() {
          try {
             action.performWork(manager);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 54d967e..f0da131 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -378,6 +378,7 @@ public class BridgeTest extends ActiveMQTestBase {
             latch = new CountDownLatch(numberOfIgnores);
          }
 
+         @Override
          public boolean intercept(Packet packet, RemotingConnection 
connection) throws ActiveMQException {
             if (ignoreSends && packet instanceof SessionSendMessage ||
                ignoreSends && packet instanceof SessionSendLargeMessage ||
@@ -1460,6 +1461,7 @@ public class BridgeTest extends ActiveMQTestBase {
 
                thread = new Thread("***Server Restarter***") {
 
+                  @Override
                   public void run() {
                      try {
                         System.out.println("Stopping server");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
index 5399e52..d9a817e 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java
@@ -23,6 +23,7 @@ import 
org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class SimpleTransformer implements Transformer {
 
+   @Override
    public ServerMessage transform(final ServerMessage message) {
       SimpleString oldProp = (SimpleString) message.getObjectProperty(new 
SimpleString("wibble"));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 0f8fe5c..d6b836b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -1079,6 +1079,7 @@ public abstract class ClusterTestBase extends 
ActiveMQTestBase {
 
       int order;
 
+      @Override
       public int compareTo(final OrderedConsumerHolder o) {
          int thisOrder = order;
          int otherOrder = o.order;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
index 7408ab6..9472202 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredGroupingTest.java
@@ -948,6 +948,7 @@ public class ClusteredGroupingTest extends ClusterTestBase {
 
          }
 
+         @Override
          public SimpleString getName() {
             return null;
          }
@@ -972,31 +973,38 @@ public class ClusteredGroupingTest extends 
ClusterTestBase {
             return false;
          }
 
+         @Override
          public Response propose(final Proposal proposal) throws Exception {
             return null;
          }
 
+         @Override
          public void proposed(final Response response) throws Exception {
             System.out.println("ClusteredGroupingTest.proposed");
          }
 
+         @Override
          public void sendProposalResponse(final Response response, final int 
distance) throws Exception {
             System.out.println("ClusteredGroupingTest.send");
          }
 
+         @Override
          public Response receive(final Proposal proposal, final int distance) 
throws Exception {
             latch.countDown();
             return null;
          }
 
+         @Override
          public void onNotification(final Notification notification) {
             System.out.println("ClusteredGroupingTest.onNotification " + 
notification);
          }
 
+         @Override
          public void addGroupBinding(final GroupBinding groupBinding) {
             System.out.println("ClusteredGroupingTest.addGroupBinding");
          }
 
+         @Override
          public Response getProposal(final SimpleString fullID, boolean 
touchTime) {
             return null;
          }
@@ -1655,6 +1663,7 @@ public class ClusteredGroupingTest extends 
ClusterTestBase {
          this.wait = wait;
       }
 
+      @Override
       public void run() {
          if (wait) {
             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/cluster/distribution/LargeMessageRedistributionTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
index e7824a7..7e444a0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java
@@ -18,6 +18,7 @@ package 
org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 public class LargeMessageRedistributionTest extends MessageRedistributionTest {
 
+   @Override
    public boolean isLargeMessage() {
       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/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
index da7c40d..e74e7ec 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java
@@ -27,6 +27,7 @@ public class NettyFileStorageSymmetricClusterTest extends 
SymmetricClusterTest {
       return true;
    }
 
+   @Override
    protected boolean isFileStorage() {
       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/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
index 377bdac..9083316 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java
@@ -23,6 +23,7 @@ public class NettyFileStorageSymmetricClusterWithBackupTest 
extends SymmetricClu
       return true;
    }
 
+   @Override
    protected boolean isFileStorage() {
       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/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
index 8b09035..df0dc9f 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java
@@ -27,6 +27,7 @@ public class 
NettyFileStorageSymmetricClusterWithDiscoveryTest extends Symmetric
       return true;
    }
 
+   @Override
    protected boolean isFileStorage() {
       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/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
index 6ae436e..b09377d 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
@@ -28,6 +28,7 @@ public class SymmetricClusterWithDiscoveryTest extends 
SymmetricClusterTest {
 
    protected final int groupPort = ActiveMQTestBase.getUDPDiscoveryPort();
 
+   @Override
    protected boolean isNetty() {
       return false;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index 8ff4407..770c538 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -60,6 +60,7 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
    @Test
    public void testNonTransactional() throws Throwable {
       runTest(new TestRunner() {
+         @Override
          public void run() {
             try {
                doTestNonTransactional(this);
@@ -77,6 +78,7 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
       runTest(new TestRunner() {
          volatile boolean running = false;
 
+         @Override
          public void run() {
             try {
                assertFalse(running);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
index 4f1468a..9a4f3a9 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor.java
@@ -24,6 +24,7 @@ import 
org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DelayInterceptor implements Interceptor {
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
       if (packet.getType() == PacketImpl.SESS_SEND) {
          // Lose the send

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
index 0edf2a7..c7ce876 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor2.java
@@ -31,6 +31,7 @@ public class DelayInterceptor2 implements Interceptor {
 
    private final CountDownLatch latch = new CountDownLatch(1);
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
       if (packet.getType() == PacketImpl.NULL_RESPONSE && loseResponse) {
          // Lose the response from the commit - only lose the first one

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
index 0f1365e..38be634 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/DelayInterceptor3.java
@@ -24,6 +24,7 @@ import 
org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class DelayInterceptor3 implements Interceptor {
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
       if (packet.getType() == PacketImpl.SESS_COMMIT) {
          // lose the commit

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
index 82456d5..0a53f61 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailBackManualTest.java
@@ -181,6 +181,7 @@ public class FailBackManualTest extends FailoverTestBase {
          this.server = server;
       }
 
+      @Override
       public void run() {
          try {
             server.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
index 3ed22f1..a83f5a0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
@@ -48,6 +48,7 @@ public class FailoverOnFlowControlTest extends 
FailoverTestBase {
       Interceptor interceptorClient = new Interceptor() {
          AtomicInteger count = new AtomicInteger(0);
 
+         @Override
          public boolean intercept(Packet packet, RemotingConnection 
connection) throws ActiveMQException {
             log.debug("Intercept..." + packet.getClass().getName());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 42d5211..3054321 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -122,6 +122,7 @@ public class FailoverTest extends FailoverTestBase {
       final CountDownLatch latchFailed = new CountDownLatch(1);
 
       Runnable r = new Runnable() {
+         @Override
          public void run() {
             for (int i = 0; i < 500; i++) {
                ClientMessage message = session.createMessage(true);
@@ -200,6 +201,7 @@ public class FailoverTest extends FailoverTestBase {
 
       consumer.setMessageHandler(new MessageHandler() {
 
+         @Override
          public void onMessage(ClientMessage message) {
             Integer counter = message.getIntProperty("counter");
             received.put(counter, message);
@@ -453,6 +455,7 @@ public class FailoverTest extends FailoverTestBase {
 
       consumer.setMessageHandler(new MessageHandler() {
 
+         @Override
          public void onMessage(ClientMessage message) {
             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/cluster/failover/LiveToLiveFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
index 430e0ec..d0876b3 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/LiveToLiveFailoverTest.java
@@ -97,6 +97,7 @@ public class LiveToLiveFailoverTest extends FailoverTest {
       
waitForRemoteBackupSynchronization(backupServers1.values().iterator().next());
    }
 
+   @Override
    protected final ClientSessionFactoryInternal 
createSessionFactoryAndWaitForTopology(ServerLocator locator,
                                                                                
        int topologyMembers) throws Exception {
       CountDownLatch countDownLatch = new CountDownLatch(topologyMembers * 2);
@@ -151,6 +152,7 @@ public class LiveToLiveFailoverTest extends FailoverTest {
       return sf;
    }
 
+   @Override
    protected void createClientSessionFactory() throws Exception {
       if (liveServer.getServer().isStarted()) {
          sf = (ClientSessionFactoryInternal) createSessionFactory(locator);
@@ -161,6 +163,7 @@ public class LiveToLiveFailoverTest extends FailoverTest {
       }
    }
 
+   @Override
    protected void createSessionFactory() throws Exception {
       
locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(-1);
 
@@ -213,6 +216,7 @@ public class LiveToLiveFailoverTest extends FailoverTest {
    }
 
    // https://jira.jboss.org/jira/browse/HORNETQ-285
+   @Override
    @Test
    public void testFailoverOnInitialConnection() throws Exception {
       
locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setFailoverOnInitialConnection(true).setReconnectAttempts(-1);
@@ -239,6 +243,7 @@ public class LiveToLiveFailoverTest extends FailoverTest {
       session.close();
    }
 
+   @Override
    @Test
    public void testCreateNewFactoryAfterFailover() throws Exception {
       this.disableCheckThread();
@@ -270,9 +275,11 @@ public class LiveToLiveFailoverTest extends FailoverTest {
    //invalid tests for Live to Live failover
    //all the timeout ones aren't as we don't migrate timeouts, any failback or 
server restart
    //or replicating tests aren't either
+   @Override
    public void testLiveAndBackupBackupComesBackNewFactory() throws Exception {
    }
 
+   @Override
    public void testLiveAndBackupLiveComesBackNewFactory() {
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index 365bd60..ce2e7b1 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -1232,6 +1232,7 @@ public abstract class MultiThreadRandomReattachTestBase 
extends MultiThreadReatt
          this.numMessages = numMessages;
       }
 
+      @Override
       public synchronized 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/cluster/reattach/OrderReattachTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
index 8878e58..f38b703 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
@@ -203,6 +203,7 @@ public class OrderReattachTest extends ActiveMQTestBase {
 
          Exception failure;
 
+         @Override
          public void onMessage(final ClientMessage message) {
             if (count >= numMessages) {
                failure = new Exception("too many messages");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
index 8dc0f62..4332a80 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -1309,6 +1309,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
       /* (non-Javadoc)
        * @see MessageHandler#onMessage(ClientMessage)
        */
+      @Override
       public void onMessage(ClientMessage message) {
          try {
             onMessageAssert(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/cluster/reattach/ReattachTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
index 12123ce..1343775 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
@@ -140,6 +140,7 @@ public class ReattachTest extends ActiveMQTestBase {
 
       Interceptor intercept = new Interceptor() {
 
+         @Override
          public boolean intercept(Packet packet, RemotingConnection 
connection) throws ActiveMQException {
             System.out.println("Intercept..." + packet.getClass().getName());
 
@@ -293,6 +294,7 @@ public class ReattachTest extends ActiveMQTestBase {
             connectionFailed(me, failedOver);
          }
 
+         @Override
          public void beforeReconnect(final ActiveMQException exception) {
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
index 6d14035..7e04b91 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/BackupSyncDelay.java
@@ -234,6 +234,7 @@ public class BackupSyncDelay implements Interceptor {
          throw new UnsupportedOperationException();
       }
 
+      @Override
       public ChannelHandler getHandler() {
          throw new UnsupportedOperationException();
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
index a22d23e..536b0ca 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/MultiServerTestBase.java
@@ -78,6 +78,7 @@ public class MultiServerTestBase extends ActiveMQTestBase {
       }
    }
 
+   @Override
    @Before
    public void setUp() throws Exception {
       super.setUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
index c7854be..162dda4 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/SameProcessActiveMQServer.java
@@ -39,34 +39,42 @@ public class SameProcessActiveMQServer implements 
TestableServer {
       return server.isActive();
    }
 
+   @Override
    public void setIdentity(String identity) {
       server.setIdentity(identity);
    }
 
+   @Override
    public boolean isStarted() {
       return server.isStarted();
    }
 
+   @Override
    public void addInterceptor(Interceptor interceptor) {
       server.getRemotingService().addIncomingInterceptor(interceptor);
    }
 
+   @Override
    public void removeInterceptor(Interceptor interceptor) {
       server.getRemotingService().removeIncomingInterceptor(interceptor);
    }
 
+   @Override
    public void start() throws Exception {
       server.start();
    }
 
+   @Override
    public void stop() throws Exception {
       server.stop();
    }
 
+   @Override
    public CountDownLatch crash(ClientSession... sessions) throws Exception {
       return crash(true, sessions);
    }
 
+   @Override
    public CountDownLatch crash(boolean waitFailure, ClientSession... sessions) 
throws Exception {
       CountDownLatch latch = new CountDownLatch(sessions.length);
       CountDownSessionFailureListener[] listeners = new 
CountDownSessionFailureListener[sessions.length];
@@ -91,6 +99,7 @@ public class SameProcessActiveMQServer implements 
TestableServer {
       return latch;
    }
 
+   @Override
    public ActiveMQServer getServer() {
       return server;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
index b6738e0..3c5b52a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/util/TestableServer.java
@@ -27,6 +27,7 @@ public interface TestableServer extends ActiveMQComponent {
 
    ActiveMQServer getServer();
 
+   @Override
    void stop() throws Exception;
 
    void setIdentity(String identity);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
index cbdc050..137d252 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryBaseTest.java
@@ -89,6 +89,7 @@ public class DiscoveryBaseTest extends ActiveMQTestBase {
 
       volatile boolean called;
 
+      @Override
       public void connectorsChanged(List<DiscoveryEntry> newConnectors) {
          called = true;
       }
@@ -101,12 +102,14 @@ public class DiscoveryBaseTest extends ActiveMQTestBase {
       List<TransportConfiguration> sortedExpected = new 
ArrayList<TransportConfiguration>(expected);
       Collections.sort(sortedExpected, new 
Comparator<TransportConfiguration>() {
 
+         @Override
          public int compare(TransportConfiguration o1, TransportConfiguration 
o2) {
             return o2.toString().compareTo(o1.toString());
          }
       });
       List<DiscoveryEntry> sortedActual = new 
ArrayList<DiscoveryEntry>(actual);
       Collections.sort(sortedActual, new Comparator<DiscoveryEntry>() {
+         @Override
          public int compare(DiscoveryEntry o1, DiscoveryEntry o2) {
             return 
o2.getConnector().toString().compareTo(o1.getConnector().toString());
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
index 8e51dbe..9ac3c6e 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/discovery/DiscoveryStayAliveTest.java
@@ -48,6 +48,7 @@ public class DiscoveryStayAliveTest extends DiscoveryBaseTest 
{
 
    }
 
+   @Override
    public void tearDown() throws Exception {
       scheduledExecutorService.shutdown();
       super.tearDown();
@@ -63,6 +64,7 @@ public class DiscoveryStayAliveTest extends DiscoveryBaseTest 
{
 
       final AtomicInteger errors = new AtomicInteger(0);
       Thread t = new Thread() {
+         @Override
          public void run() {
             try {
                dg.internalRunning();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Incoming.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Incoming.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Incoming.java
index a517764..6cf1ef3 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Incoming.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Incoming.java
@@ -26,6 +26,7 @@ import 
org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class Incoming implements Interceptor {
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
 
       System.out.println("Incoming:Packet : " + 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/interceptors/InterceptorTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
index c915586..79d6c72 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
@@ -83,6 +83,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyInterceptor1 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_SEND) {
             SessionSendMessage p = (SessionSendMessage) packet;
@@ -99,6 +100,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class InterceptUserOnCreateQueue implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.CREATE_QUEUE) {
             String userName = getUsername(packet, connection);
@@ -129,6 +131,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class InterceptUserOnCreateConsumer implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_CREATECONSUMER) {
             String userName = getUsername(packet, connection);
@@ -159,6 +162,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyOutgoingInterceptor1 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_RECEIVE_MSG) {
             SessionReceiveMessage p = (SessionReceiveMessage) packet;
@@ -175,6 +179,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyInterceptor2 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_SEND) {
             return false;
@@ -187,6 +192,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyOutgoingInterceptor2 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (isForceDeliveryResponse(packet)) {
             return true;
@@ -202,6 +208,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyInterceptor3 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_RECEIVE_MSG) {
             SessionReceiveMessage p = (SessionReceiveMessage) packet;
@@ -218,6 +225,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyOutgoingInterceptor3 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_SEND) {
             SessionSendMessage p = (SessionSendMessage) packet;
@@ -234,6 +242,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyInterceptor4 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (isForceDeliveryResponse(packet)) {
             return true;
@@ -250,6 +259,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private class MyOutgoingInterceptor4 implements Interceptor {
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (isForceDeliveryResponse(packet)) {
             return true;
@@ -306,6 +316,7 @@ public class InterceptorTest extends ActiveMQTestBase {
          this.wasCalled = wasCalled;
       }
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
          if (packet.getType() == PacketImpl.SESS_SEND) {
             SessionSendMessage p = (SessionSendMessage) packet;
@@ -353,6 +364,7 @@ public class InterceptorTest extends ActiveMQTestBase {
          this.wasCalled = wasCalled;
       }
 
+      @Override
       public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
 
          if (isForceDeliveryResponse(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/interceptors/Outgoing.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
index bc6e44a..7bd85df 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/Outgoing.java
@@ -26,6 +26,7 @@ import 
org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 public class Outgoing implements Interceptor {
 
+   @Override
    public boolean intercept(final Packet packet, final RemotingConnection 
connection) throws ActiveMQException {
       System.out.println("Outgoin:Packet : " + packet);
       if (packet.getType() == PacketImpl.SESS_SEND) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 1d86901..a8a44e0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -73,6 +73,7 @@ public class ManualReconnectionToSingleServerTest extends 
ActiveMQTestBase {
    private static final int NUM = 20;
 
    private final ExceptionListener exceptionListener = new ExceptionListener() 
{
+      @Override
       public void onException(final JMSException e) {
          exceptionLatch.countDown();
          disconnect();
@@ -231,6 +232,7 @@ public class ManualReconnectionToSingleServerTest extends 
ActiveMQTestBase {
 
       private int count = 0;
 
+      @Override
       public void onMessage(final Message msg) {
          count++;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
index 861b568..a02dec0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupIDTest.java
@@ -37,6 +37,7 @@ public class GroupIDTest extends GroupingTest {
       return cf;
    }
 
+   @Override
    @Test
    public void testManyGroups() {
       // this test does not make sense here

Reply via email to