You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/07/19 15:09:26 UTC
[2/3] activemq-artemis git commit: Add missing @Override annotations
Add missing @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/39edf958
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/39edf958
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/39edf958
Branch: refs/heads/master
Commit: 39edf958a18934e3db02061d2f9e7d0b461c2d8d
Parents: d1d2ebe
Author: Ville Skytt� <vi...@iki.fi>
Authored: Tue Jul 19 10:58:00 2016 +0300
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Jul 19 16:09:12 2016 +0100
----------------------------------------------------------------------
.../artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java | 1 +
.../activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java | 2 ++
.../activemq/artemis/core/io/mapped/MappedByteBufferCache.java | 1 +
.../activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java | 1 +
.../persistence/impl/journal/AbstractJournalStorageManager.java | 1 +
.../activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java | 1 +
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 1 +
.../extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java | 1 +
.../tests/integration/amqp/jms/SendingAndReceivingTest.java | 2 ++
.../tests/integration/divert/ReplicationWithDivertTest.java | 1 +
.../tests/integration/jdbc/store/journal/JDBCJournalTest.java | 1 +
.../tests/integration/largemessage/LargeMessageTestBase.java | 1 +
.../integration/management/ActiveMQServerControlUsingCoreTest.java | 1 +
.../artemis/tests/integration/stomp/StompTestWithSecurity.java | 1 +
14 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index f54dc04..4a2c991 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -290,6 +290,7 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
/**
* Drop all tables and data
*/
+ @Override
public synchronized void destroy() throws SQLException {
try {
connection.setAutoCommit(false);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 81fd683..fe5e69d 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -92,6 +92,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
started = true;
}
+ @Override
protected void createSchema() throws SQLException {
createTable(sqlProvider.getCreateJournalTableSQL());
}
@@ -118,6 +119,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
}
}
+ @Override
public synchronized void destroy() throws Exception {
super.destroy();
stop();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
index dee951d..d097055 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedByteBufferCache.java
@@ -200,6 +200,7 @@ final class MappedByteBufferCache implements AutoCloseable {
return closed;
}
+ @Override
public void close() {
if (!closed) {
//TO_FIX: unmap in this way is not portable BUT required on Windows that can't resize a memory mapped file!
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
index d81591c..c95f214 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
@@ -100,6 +100,7 @@ public class PagingStoreFactoryNIO implements PagingStoreFactory {
return new PageCursorProviderImpl(store, storageManager, executor, addressSettings.getPageCacheMaxSize());
}
+ @Override
public synchronized PagingStore newStore(final SimpleString address, final AddressSettings settings) {
return new PagingStoreImpl(address, scheduledExecutor, syncTimeout, pagingManager, storageManager, null, this, address, settings, executorFactory.getExecutor(), syncNonTransactional);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index ed2e1f4..8fac438 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -292,6 +292,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
getContext().executeOnCompletion(run);
}
+ @Override
public void afterStoreOperations(IOCallback run) {
getContext().executeOnCompletion(run, true);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index 5e04c4a..f5742c5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -370,6 +370,7 @@ public class NettyAcceptor extends AbstractAcceptor {
channel.pipeline().addLast(protocolHandler.getProtocolDecoder());
}
+ @Override
public void reload() {
serverChannelGroup.disconnect();
serverChannelGroup.clear();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 3fa336a..9067f86 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2339,6 +2339,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
this.runnable = runnable;
}
+ @Override
public void run() {
lockActivation();
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
index 34e6336..c939a46 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
@@ -183,6 +183,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase
final MapMessage message = createLargeMessage();
t = new Thread() {
+ @Override
public void run() {
try {
producer.send(message);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/jms/SendingAndReceivingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/jms/SendingAndReceivingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/jms/SendingAndReceivingTest.java
index 313ac84..e0b1899 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/jms/SendingAndReceivingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/jms/SendingAndReceivingTest.java
@@ -40,6 +40,7 @@ public class SendingAndReceivingTest extends ActiveMQTestBase {
private ActiveMQServer server;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
server = createServer(true, true);
@@ -47,6 +48,7 @@ public class SendingAndReceivingTest extends ActiveMQTestBase {
}
@After
+ @Override
public void tearDown() throws Exception {
try {
server.stop();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
index f641b40..4200b7d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
@@ -184,6 +184,7 @@ public class ReplicationWithDivertTest extends ActiveMQTestBase {
final MapMessage message = createLargeMessage();
t = new Thread() {
+ @Override
public void run() {
try {
for (int i = 0; i < numberOfMessage; i++) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
index 7eb4b9a..6715554 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
@@ -125,6 +125,7 @@ public class JDBCJournalTest extends ActiveMQTestBase {
}
@After
+ @Override
public void tearDown() throws Exception {
journal.destroy();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index 03ed5b0..290661e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -79,6 +79,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
this.storeType = storeType;
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
if (storeType == StoreConfiguration.StoreType.DATABASE) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 05ad2bd..2bd2a8b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -708,6 +708,7 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
};
}
+ @Override
public boolean usingCore() {
return true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39edf958/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithSecurity.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithSecurity.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithSecurity.java
index 40e8a63..e9d5550 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithSecurity.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithSecurity.java
@@ -55,6 +55,7 @@ public class StompTestWithSecurity extends StompTestBase {
Assert.assertTrue(Math.abs(tnow - tmsg) < 1000);
}
+ @Override
public boolean isSecurityEnabled() {
return true;
}