From 7bff07d5b1b2a0c9c49694a68aaf12d0d5082771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 14 Sep 2016 13:22:20 +0300 Subject: [PATCH] Add missing @Overrides --- .../artemis/core/server/ActiveMQScheduledComponent.java | 1 + .../proton/plug/ActiveMQProtonConnectionCallback.java | 1 + .../plug/context/server/ProtonServerConnectionContext.java | 1 + .../activemq/artemis/core/paging/impl/PageSyncTimer.java | 1 + .../artemis/core/paging/impl/PagingManagerImpl.java | 3 +++ .../artemis/core/server/files/FileStoreMonitor.java | 1 + .../artemis/core/server/reload/ReloadManagerImpl.java | 1 + .../artemis/tests/unit/util/FakePagingManager.java | 7 ++++--- 8 files changed, 13 insertions(+), 3 deletions(-) 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 4d503ebf936..76b20f9ddd5 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 synchronized void stop() { } + @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 e3de595904b..6e6a40506c8 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 ServerSASL[] getSASLMechnisms() { 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 4124c2f5496..83048d17aa3 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 @@ protected void remoteLinkOpened(Link link) throws Exception { } } + @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 37cffb59666..541743997b4 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 @@ synchronized void addSync(OperationContext ctx) { 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 a657a222834..99074f3f0b1 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 PagingManagerImpl(final PagingStoreFactory pagingSPI, this(pagingSPI, addressSettingsRepository, -1); } + @Override public void addBlockedStore(PagingStore store) { blockedStored.add(store); } @@ -164,10 +165,12 @@ public boolean isDiskFull() { 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 a5259bd56cc..6fc24093bb8 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 synchronized FileStoreMonitor addStore(FileStore store) { } + @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 43fe54c25fd..8bce62d9cf7 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 ReloadManagerImpl(ScheduledExecutorService scheduledExecutorService, Exec 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 bbaa3a3f214..500a81fd3e1 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 boolean isDiskFull() { } /* - * (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; }