diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 4d503ebf93..76b20f9ddd 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -113,6 +113,7 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R
 
    }
 
+   @Override
    public void run() {
       delayed.decrementAndGet();
    }
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
index e3de595904..6e6a40506c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
@@ -72,6 +72,7 @@ public class ActiveMQProtonConnectionCallback implements AMQPConnectionCallback
       return result;
    }
 
+   @Override
    public boolean isSupportsAnonymous() {
       boolean supportsAnonymous = false;
       try {
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
index 4124c2f549..83048d17aa 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
@@ -82,6 +82,7 @@ public class ProtonServerConnectionContext extends AbstractConnectionContext imp
       }
    }
 
+   @Override
    public Symbol[] getConnectionCapabilitiesOffered() {
       return new Symbol[]{DELAYED_DELIVERY};
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
index 37cffb5966..541743997b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
@@ -76,6 +76,7 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
       syncOperations.add(ctx);
    }
 
+   @Override
    public void run() {
       super.run();
       tick();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
index a657a22283..99074f3f0b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
@@ -90,6 +90,7 @@ public final class PagingManagerImpl implements PagingManager {
       this(pagingSPI, addressSettingsRepository, -1);
    }
 
+   @Override
    public void addBlockedStore(PagingStore store) {
       blockedStored.add(store);
    }
@@ -164,10 +165,12 @@ public final class PagingManagerImpl implements PagingManager {
       return diskFull;
    }
 
+   @Override
    public boolean isUsingGlobalSize() {
       return maxSize > 0;
    }
 
+   @Override
    public boolean isGlobalFull() {
       return diskFull || maxSize > 0 && globalSizeBytes.get() > maxSize;
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
index a5259bd56c..6fc24093bb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
@@ -72,6 +72,7 @@ public class FileStoreMonitor extends ActiveMQScheduledComponent {
    }
 
 
+   @Override
    public void run() {
       super.run();
       tick();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
index 43fe54c25f..8bce62d9cf 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
@@ -42,6 +42,7 @@ public class ReloadManagerImpl extends ActiveMQScheduledComponent implements Rel
       super(scheduledExecutorService, executor, checkPeriod, TimeUnit.MILLISECONDS, false);
    }
 
+   @Override
    public void run() {
       super.run();
       tick();
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
index bbaa3a3f21..500a81fd3e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
@@ -115,9 +115,10 @@ public final class FakePagingManager implements PagingManager {
    }
 
    /*
-       * (non-Javadoc)
-       * @see org.apache.activemq.artemis.core.paging.PagingManager#isGlobalFull()
-       */
+    * (non-Javadoc)
+    * @see org.apache.activemq.artemis.core.paging.PagingManager#isGlobalFull()
+    */
+   @Override
    public boolean isGlobalFull() {
       return false;
    }