diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 221413c3bf..3a4656e9ee 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -539,6 +539,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
       rollback(false);
    }
 
+   @Override
    public void rollback(final boolean isLastMessageAsDelivered) throws ActiveMQException
    {
       rollback(isLastMessageAsDelivered, true);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index 7be83540fb..62943ca60a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -100,6 +100,7 @@ public class NettyConnection implements Connection {
    // Connection implementation ----------------------------
 
 
+   @Override
    public boolean isWritable(ReadyListener callback) {
       synchronized (readyListeners) {
          readyListeners.push(callback);
@@ -108,6 +109,7 @@ public class NettyConnection implements Connection {
       }
    }
 
+   @Override
    public void fireReady(final boolean ready) {
       synchronized (readyListeners) {
          this.ready = ready;
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
index 0603951dde..6126bb351d 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
@@ -53,6 +53,7 @@ public class MQTTConnection implements RemotingConnection {
       this.destroyed = false;
    }
 
+   @Override
    public boolean isWritable(ReadyListener callback) {
       return transportConnection.isWritable(callback);
    }
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 43cc92db15..c2c535e449 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -161,6 +161,7 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
       this.creationTime = System.currentTimeMillis();
    }
 
+   @Override
    public boolean isWritable(ReadyListener callback) {
       return transportConnection.isWritable(callback);
    }
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index 31d73776dd..568e5b1e3e 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -119,6 +119,7 @@ public final class StompConnection implements RemotingConnection {
       return frame;
    }
 
+   @Override
    public boolean isWritable(ReadyListener callback) {
       return transportConnection.isWritable(callback);
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
index 0cbb5756b4..2af8a16737 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnection.java
@@ -101,6 +101,7 @@ public class InVMConnection implements Connection {
       // no op
    }
 
+   @Override
    public boolean isWritable(ReadyListener listener) {
       return true;
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java
index ee90c4a4f5..db55aa8e0d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java
@@ -357,10 +357,12 @@ public class TransactionImpl implements Transaction {
       // to execute this runnable in the correct order
       storageManager.afterCompleteOperations(new IOCallback() {
 
+         @Override
          public void onError(final int errorCode, final String errorMessage) {
             ActiveMQServerLogger.LOGGER.ioErrorOnTX(errorCode, errorMessage);
          }
 
+         @Override
          public void done() {
             afterRollback(operationsToComplete);
          }
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 ea597ac703..8077a3314e 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
@@ -157,6 +157,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);
@@ -199,6 +200,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
       final AtomicBoolean metaDataFailed = new AtomicBoolean(false);
 
       Thread buggerThread = new Thread() {
+         @Override
          public void run() {
             while (running.get()) {
                try {
@@ -398,6 +400,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
          isDeliveryTransacted = deliveryTransacted;
       }
 
+      @Override
       public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException {
          TestEndpoint retEnd = new TestEndpoint();
          if (xaResource != null) {
@@ -406,6 +409,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
          return retEnd;
       }
 
+      @Override
       public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException {
          return isDeliveryTransacted;
       }
@@ -446,6 +450,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
 
       }
 
+      @Override
       public void onMessage(Message message) {
          Integer value = 0;
 
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java
index 32d88164fb..635135739f 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java
@@ -142,6 +142,7 @@ public class PersistMultiThreadTest extends ActiveMQTestBase {
          this.finish = finish;
       }
 
+      @Override
       public void run() {
          try {
             align.countDown();
@@ -215,6 +216,7 @@ public class PersistMultiThreadTest extends ActiveMQTestBase {
          this.numberOfMessages = numberOfMessages;
       }
 
+      @Override
       public void run() {
          long deletesNr = 0;
          try {
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
index c55ac22a12..8cde45eeda 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
@@ -93,6 +93,7 @@ public class SendReceiveMultiThreadTest extends ActiveMQTestBase {
       cf = new ActiveMQConnectionFactory();
 
       Thread slowSending = new Thread() {
+         @Override
          public void run() {
             Connection conn = null;
             try {
@@ -207,6 +208,7 @@ public class SendReceiveMultiThreadTest extends ActiveMQTestBase {
 
       int errors = 0;
 
+      @Override
       public void run() {
          try {
 
@@ -258,6 +260,7 @@ public class SendReceiveMultiThreadTest extends ActiveMQTestBase {
          this.finish = finish;
       }
 
+      @Override
       public void run() {
          try {