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/NewQueueRequestorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java index c3e2b1d..1fec02b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java @@ -90,6 +90,7 @@ public class NewQueueRequestorTest extends JMSTestBase { sender = sess.createSender(null); } + @Override public void onMessage(final Message m) { try { Destination queue = m.getJMSReplyTo();
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/RemoteConnectionStressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java index ea0526a..c457d73 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/RemoteConnectionStressTest.java @@ -46,6 +46,7 @@ public class RemoteConnectionStressTest extends ActiveMQTestBase { MBeanServer mbeanServer; JMSServerManagerImpl jmsServer; + @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/jms/client/TopicCleanupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java index 084060f..8ce9ced 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java @@ -47,6 +47,7 @@ import org.junit.Test; */ public class TopicCleanupTest extends JMSTestBase { + @Override protected boolean usePersistence() { 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/jms/cluster/BindingsClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java index 674c9f1..38b8ad6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java @@ -59,6 +59,7 @@ public class BindingsClusterTest extends JMSClusteredTestBase { return Arrays.asList(new Object[][]{{true}, {false}}); } + @Override @Before public void setUp() throws Exception { //todo fix if needed 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/cluster/JMSFailoverListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java index a4e867c..d2139e9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java @@ -337,6 +337,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase { Assert.assertTrue(eventTypeList.size() >= elements); } + @Override public void failoverEvent(FailoverEventType eventType) { eventTypeList.add(eventType); } 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/cluster/JMSFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java index cf0502d..2c1edb6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java @@ -360,6 +360,7 @@ public class JMSFailoverTest extends ActiveMQTestBase { // The thread that will fail the server Thread spoilerThread = new Thread() { + @Override public void run() { flagAlign.countDown(); // a large timeout just to help in case of debugging @@ -505,6 +506,7 @@ public class JMSFailoverTest extends ActiveMQTestBase { volatile JMSException e; + @Override public void onException(final JMSException e) { this.e = e; } 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/cluster/JMSReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java index 3c429d9..26dea90 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java @@ -306,6 +306,7 @@ public class JMSReconnectTest extends ActiveMQTestBase { volatile JMSException e; + @Override public void onException(final JMSException e) { this.e = e; } 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/cluster/LargeMessageOverBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index 1c7bf20..e2adebb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -164,6 +164,7 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { } } + @Override protected Configuration createConfigServer(final int source, final int destination) throws Exception { Configuration config = super.createConfigServer(source, destination); 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/cluster/MultipleThreadsOpeningTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java index 6475a13..b98bf07 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java @@ -47,6 +47,7 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase { int errors = 0; + @Override public void run() { 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/jms/connection/CloseConnectionFactoryOnGCest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java index 38f2ff7..f2e11f9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java @@ -37,6 +37,7 @@ public class CloseConnectionFactoryOnGCest extends JMSTestBase { final AtomicInteger valueGC = new AtomicInteger(0); ServerLocatorImpl.finalizeCallback = new Runnable() { + @Override public void run() { valueGC.incrementAndGet(); } 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/connection/CloseConnectionOnGCTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java index adb92e7..5cc0baa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/CloseConnectionOnGCTest.java @@ -67,6 +67,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase { final CountDownLatch latch = new CountDownLatch(1); Iterator<RemotingConnection> connectionIterator = server.getRemotingService().getConnections().iterator(); connectionIterator.next().addCloseListener(new CloseListener() { + @Override public void connectionClosed() { latch.countDown(); } @@ -97,6 +98,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase { while (connectionIterator.hasNext()) { RemotingConnection remotingConnection = connectionIterator.next(); remotingConnection.addCloseListener(new CloseListener() { + @Override public void connectionClosed() { latch.countDown(); } @@ -136,6 +138,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase { while (connectionIterator.hasNext()) { RemotingConnection remotingConnection = connectionIterator.next(); remotingConnection.addCloseListener(new CloseListener() { + @Override public void connectionClosed() { 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/jms/connection/ExceptionListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java index 26f1784..6e62231 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java @@ -79,6 +79,7 @@ public class ExceptionListenerTest extends ActiveMQTestBase { this.latch = latch; } + @Override public synchronized void onException(final JMSException arg0) { numCalls++; 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/jms/consumer/ConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java index fe0276c..ae4d041 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java @@ -207,6 +207,7 @@ public class ConsumerTest extends JMSTestBase { int count = 0; + @Override public void onMessage(Message msg) { try { TextMessage txtmsg = (TextMessage) msg; @@ -466,6 +467,7 @@ public class ConsumerTest extends JMSTestBase { jBossQueue = ActiveMQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(final Message msg) { } }); @@ -481,6 +483,7 @@ public class ConsumerTest extends JMSTestBase { jBossQueue = ActiveMQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(final Message msg) { } }); 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/server/management/JMSQueueControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java index c98f942..a17e895 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java @@ -88,86 +88,107 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { } } + @Override public boolean changeMessagePriority(final String messageID, final int newPriority) throws Exception { return (Boolean) proxy.invokeOperation("changeMessagePriority", messageID, newPriority); } + @Override public int changeMessagesPriority(final String filter, final int newPriority) throws Exception { return (Integer) proxy.invokeOperation("changeMessagesPriority", filter, newPriority); } + @Override public long countMessages(final String filter) throws Exception { return ((Number) proxy.invokeOperation("countMessages", filter)).intValue(); } + @Override public boolean expireMessage(final String messageID) throws Exception { return (Boolean) proxy.invokeOperation("expireMessage", messageID); } + @Override public int expireMessages(final String filter) throws Exception { return (Integer) proxy.invokeOperation("expireMessages", filter); } + @Override public int getConsumerCount() { return (Integer) proxy.retrieveAttributeValue("consumerCount"); } + @Override public String getDeadLetterAddress() { return (String) proxy.retrieveAttributeValue("deadLetterAddress"); } + @Override public int getDeliveringCount() { return (Integer) proxy.retrieveAttributeValue("deliveringCount"); } + @Override public String getExpiryAddress() { return (String) proxy.retrieveAttributeValue("expiryAddress"); } + @Override public String getFirstMessageAsJSON() throws Exception { return (String) proxy.retrieveAttributeValue("firstMessageAsJSON"); } + @Override public Long getFirstMessageTimestamp() throws Exception { return (Long) proxy.retrieveAttributeValue("firstMessageTimestamp"); } + @Override public Long getFirstMessageAge() throws Exception { return (Long) proxy.retrieveAttributeValue("firstMessageAge"); } + @Override public long getMessageCount() { return ((Number) proxy.retrieveAttributeValue("messageCount")).longValue(); } + @Override public long getMessagesAdded() { return (Integer) proxy.retrieveAttributeValue("messagesAdded"); } + @Override public String getName() { return (String) proxy.retrieveAttributeValue("name"); } + @Override public long getScheduledCount() { return (Long) proxy.retrieveAttributeValue("scheduledCount"); } + @Override public boolean isTemporary() { return (Boolean) proxy.retrieveAttributeValue("temporary"); } + @Override public String listMessageCounter() throws Exception { return (String) proxy.invokeOperation("listMessageCounter"); } + @Override public void resetMessageCounter() throws Exception { proxy.invokeOperation("resetMessageCounter"); } + @Override public String listMessageCounterAsHTML() throws Exception { return (String) proxy.invokeOperation("listMessageCounterAsHTML"); } + @Override public String listMessageCounterHistory() throws Exception { return (String) proxy.invokeOperation("listMessageCounterHistory"); } @@ -176,10 +197,12 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { return (Boolean) proxy.invokeOperation("retryMessage",messageID); } + @Override public int retryMessages() throws Exception { return (Integer) proxy.invokeOperation("retryMessages"); } + @Override public boolean retryMessage(final String messageID) throws Exception { return (Boolean) proxy.invokeOperation("retryMessage",messageID); } @@ -204,10 +227,12 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { return null; } + @Override public String listMessageCounterHistoryAsHTML() throws Exception { return (String) proxy.invokeOperation("listMessageCounterHistoryAsHTML"); } + @Override public Map<String, Object>[] listMessages(final String filter) throws Exception { Object[] res = (Object[]) proxy.invokeOperation("listMessages", filter); Map<String, Object>[] results = new Map[res.length]; @@ -217,40 +242,49 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { return results; } + @Override public String listMessagesAsJSON(final String filter) throws Exception { return (String) proxy.invokeOperation("listMessagesAsJSON", filter); } + @Override public boolean moveMessage(String messageID, String otherQueueName, boolean rejectDuplicates) throws Exception { return (Boolean) proxy.invokeOperation("moveMessage", messageID, otherQueueName, rejectDuplicates); } + @Override public int moveMessages(String filter, String otherQueueName, boolean rejectDuplicates) throws Exception { return (Integer) proxy.invokeOperation("moveMessages", filter, otherQueueName, rejectDuplicates); } + @Override public int moveMessages(final String filter, final String otherQueueName) throws Exception { return (Integer) proxy.invokeOperation("moveMessages", filter, otherQueueName); } + @Override public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception { return (Boolean) proxy.invokeOperation("moveMessage", messageID, otherQueueName); } + @Override public int removeMessages(final String filter) throws Exception { return (Integer) proxy.invokeOperation("removeMessages", filter); } + @Override public boolean removeMessage(final String messageID) throws Exception { return (Boolean) proxy.invokeOperation("removeMessage", messageID); } + @Override public boolean sendMessageToDeadLetterAddress(final String messageID) throws Exception { return (Boolean) proxy.invokeOperation("sendMessageToDeadLetterAddress", messageID); } + @Override public int sendMessagesToDeadLetterAddress(final String filterStr) throws Exception { return (Integer) proxy.invokeOperation("sendMessagesToDeadLetterAddress", filterStr); } @@ -263,36 +297,44 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { proxy.invokeOperation("setExpiryAddress", expiryAddress); } + @Override public String getAddress() { return (String) proxy.retrieveAttributeValue("address"); } + @Override public boolean isPaused() throws Exception { return (Boolean) proxy.invokeOperation("isPaused"); } + @Override public void pause() throws Exception { proxy.invokeOperation("pause"); } + @Override public void resume() throws Exception { proxy.invokeOperation("resume"); } + @Override public String getSelector() { return (String) proxy.retrieveAttributeValue("selector"); } + @Override public void addBinding(String jndi) throws Exception { // TODO: Add a test for this proxy.invokeOperation("addBindings", jndi); } + @Override public String[] getRegistryBindings() { // TODO: Add a test for this return null; } + @Override public String listConsumersAsJSON() throws Exception { return (String) proxy.invokeOperation("listConsumersAsJSON"); } 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/server/management/JMSServerControl2Test.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java index b1a7e6d..194bce9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java @@ -851,6 +851,7 @@ public class JMSServerControl2Test extends ManagementTestBase { final CountDownLatch exceptionLatch = new CountDownLatch(1); connection.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.countDown(); } @@ -899,6 +900,7 @@ public class JMSServerControl2Test extends ManagementTestBase { final CountDownLatch exceptionLatch = new CountDownLatch(1); connection.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.countDown(); } @@ -966,6 +968,7 @@ public class JMSServerControl2Test extends ManagementTestBase { final CountDownLatch exceptionLatch = new CountDownLatch(1); connection.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.countDown(); } @@ -1046,12 +1049,14 @@ public class JMSServerControl2Test extends ManagementTestBase { final CountDownLatch exceptionLatch = new CountDownLatch(2); connection.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.countDown(); } }); connection2.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.countDown(); } @@ -1125,6 +1130,7 @@ public class JMSServerControl2Test extends ManagementTestBase { final CountDownLatch exceptionLatch = new CountDownLatch(1); connection.setExceptionListener(new ExceptionListener() { + @Override public void onException(final JMSException e) { exceptionLatch.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/jms/server/management/JMSServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java index 8200791..bf06eb6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java @@ -681,6 +681,7 @@ public class JMSServerControlTest extends ManagementTestBase { server.getConfiguration().getConnectorConfigurations().put("tst", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); doCreateConnectionFactory(new ConnectionFactoryCreator() { + @Override public void createConnectionFactory(final JMSServerControl control, final String cfName, final Object[] bindings) throws Exception { @@ -1038,34 +1039,41 @@ public class JMSServerControlTest extends ManagementTestBase { this.delegate = delegate; } + @Override public void storeDestination(PersistedDestination destination) throws Exception { destinationMap.put(destination.getName(), destination); delegate.storeDestination(destination); } + @Override public void deleteDestination(PersistedType type, String name) throws Exception { destinationMap.remove(name); delegate.deleteDestination(type, name); } + @Override public List<PersistedDestination> recoverDestinations() { return delegate.recoverDestinations(); } + @Override public void deleteConnectionFactory(String connectionFactory) throws Exception { connectionFactoryMap.remove(connectionFactory); delegate.deleteConnectionFactory(connectionFactory); } + @Override public void storeConnectionFactory(PersistedConnectionFactory connectionFactory) throws Exception { connectionFactoryMap.put(connectionFactory.getName(), connectionFactory); delegate.storeConnectionFactory(connectionFactory); } + @Override public List<PersistedConnectionFactory> recoverConnectionFactories() { return delegate.recoverConnectionFactories(); } + @Override public void addBindings(PersistedType type, String name, String... address) throws Exception { persistedJNDIMap.putIfAbsent(name, new ArrayList<String>()); for (String ad : address) { @@ -1074,32 +1082,39 @@ public class JMSServerControlTest extends ManagementTestBase { delegate.addBindings(type, name, address); } + @Override public List<PersistedBindings> recoverPersistedBindings() throws Exception { return delegate.recoverPersistedBindings(); } + @Override public void deleteBindings(PersistedType type, String name, String address) throws Exception { persistedJNDIMap.get(name).remove(address); delegate.deleteBindings(type, name, address); } + @Override public void deleteBindings(PersistedType type, String name) throws Exception { persistedJNDIMap.get(name).clear(); delegate.deleteBindings(type, name); } + @Override public void start() throws Exception { delegate.start(); } + @Override public void stop() throws Exception { delegate.stop(); } + @Override public boolean isStarted() { return delegate.isStarted(); } + @Override public void load() throws Exception { delegate.load(); } 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/server/management/JMSServerControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java index abf4d3f..c2ee227 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java @@ -154,26 +154,32 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { return new JMSServerControl() { + @Override public boolean closeConnectionsForAddress(final String ipAddress) throws Exception { return (Boolean) proxy.invokeOperation("closeConnectionsForAddress", ipAddress); } + @Override public boolean closeConsumerConnectionsForAddress(final String address) throws Exception { return (Boolean) proxy.invokeOperation("closeConsumerConnectionsForAddress", address); } + @Override public boolean closeConnectionsForUser(final String userName) throws Exception { return (Boolean) proxy.invokeOperation("closeConnectionsForUser", userName); } + @Override public boolean createQueue(final String name) throws Exception { return (Boolean) proxy.invokeOperation("createQueue", name); } + @Override public boolean createQueue(String name, String jndiBindings, String selector) throws Exception { return (Boolean) proxy.invokeOperation("createQueue", name, jndiBindings, selector); } + @Override public boolean createQueue(String name, String jndiBindings, String selector, @@ -181,14 +187,17 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { return (Boolean) proxy.invokeOperation("createQueue", name, jndiBindings, selector, durable); } + @Override public boolean createTopic(final String name) throws Exception { return (Boolean) proxy.invokeOperation("createTopic", name); } + @Override public void destroyConnectionFactory(final String name) throws Exception { proxy.invokeOperation("destroyConnectionFactory", name); } + @Override public boolean destroyQueue(final String name) throws Exception { return (Boolean) proxy.invokeOperation("destroyQueue", name); } @@ -198,90 +207,112 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { return (Boolean) proxy.invokeOperation("destroyQueue", name, removeConsumers); } + @Override public boolean destroyTopic(final String name) throws Exception { return (Boolean) proxy.invokeOperation("destroyTopic", name); } + @Override public boolean destroyTopic(final String name, boolean removeConsumers) throws Exception { return (Boolean) proxy.invokeOperation("destroyTopic", name, removeConsumers); } + @Override public String getVersion() { return (String) proxy.retrieveAttributeValue("version"); } + @Override public boolean isStarted() { return (Boolean) proxy.retrieveAttributeValue("started"); } + @Override public String[] getQueueNames() { return JMSServerControlUsingJMSTest.toStringArray((Object[]) proxy.retrieveAttributeValue("queueNames")); } + @Override public String[] getTopicNames() { return JMSServerControlUsingJMSTest.toStringArray((Object[]) proxy.retrieveAttributeValue("topicNames")); } + @Override public String[] getConnectionFactoryNames() { return JMSServerControlUsingJMSTest.toStringArray((Object[]) proxy.retrieveAttributeValue("connectionFactoryNames")); } + @Override public String[] listConnectionIDs() throws Exception { return (String[]) proxy.invokeOperation("listConnectionIDs"); } + @Override public String listConnectionsAsJSON() throws Exception { return (String) proxy.invokeOperation("listConnectionsAsJSON"); } + @Override public String listConsumersAsJSON(String connectionID) throws Exception { return (String) proxy.invokeOperation("listConsumersAsJSON", connectionID); } + @Override public String[] listRemoteAddresses() throws Exception { return (String[]) proxy.invokeOperation("listRemoteAddresses"); } + @Override public String[] listRemoteAddresses(final String ipAddress) throws Exception { return (String[]) proxy.invokeOperation("listRemoteAddresses", ipAddress); } + @Override public String[] listSessions(final String connectionID) throws Exception { return (String[]) proxy.invokeOperation("listSessions", connectionID); } + @Override public boolean createQueue(String name, String jndiBinding) throws Exception { return (Boolean) proxy.invokeOperation("createQueue", name, jndiBinding); } + @Override public boolean createTopic(String name, String jndiBinding) throws Exception { return (Boolean) proxy.invokeOperation("createTopic", name, jndiBinding); } + @Override public String[] listTargetDestinations(String sessionID) throws Exception { return null; } + @Override public String getLastSentMessageID(String sessionID, String address) throws Exception { return null; } + @Override public String getSessionCreationTime(String sessionID) throws Exception { return (String) proxy.invokeOperation("getSessionCreationTime", sessionID); } + @Override public String listSessionsAsJSON(String connectionID) throws Exception { return (String) proxy.invokeOperation("listSessionsAsJSON", connectionID); } + @Override public String listPreparedTransactionDetailsAsJSON() throws Exception { return (String) proxy.invokeOperation("listPreparedTransactionDetailsAsJSON"); } + @Override public String listPreparedTransactionDetailsAsHTML() throws Exception { return (String) proxy.invokeOperation("listPreparedTransactionDetailsAsHTML"); } + @Override public void createConnectionFactory(String name, boolean ha, boolean useDiscovery, @@ -292,6 +323,7 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { } + @Override public void createConnectionFactory(String name, boolean ha, boolean useDiscovery, @@ -301,10 +333,12 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { proxy.invokeOperation("createConnectionFactory", name, ha, useDiscovery, cfType, connectors, jndiBindings); } + @Override public String listAllConsumersAsJSON() throws Exception { return (String) proxy.invokeOperation("listAllConsumersAsJSON"); } + @Override public void createConnectionFactory(String name, boolean ha, boolean useDiscovery, @@ -343,6 +377,7 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { proxy.invokeOperation("createConnectionFactory", name, ha, useDiscovery, cfType, connectors, jndiBindings, clientID, clientFailureCheckPeriod, connectionTTL, callTimeout, callFailoverTimeout, minLargeMessageSize, compressLargeMessages, consumerWindowSize, consumerMaxRate, confirmationWindowSize, producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnDurableSend, blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, transactionBatchSize, dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, reconnectAttempts, failoverOnInitialConnection, groupId); } + @Override public void createConnectionFactory(String name, boolean ha, boolean useDiscovery, @@ -381,6 +416,7 @@ public class JMSServerControlUsingJMSTest extends JMSServerControlTest { proxy.invokeOperation("createConnectionFactory", name, ha, useDiscovery, cfType, connectors, jndiBindings, clientID, clientFailureCheckPeriod, connectionTTL, callTimeout, callFailoverTimeout, minLargeMessageSize, compressLargeMessages, consumerWindowSize, consumerMaxRate, confirmationWindowSize, producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnDurableSend, blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, transactionBatchSize, dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, reconnectAttempts, failoverOnInitialConnection, groupId); } + @Override public String closeConnectionWithClientID(String clientID) throws Exception { return (String) proxy.invokeOperation("closeConnectionWithClientID", clientID); } 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/server/management/JMSUtil.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java index 2912c00..79c0e83 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java @@ -207,6 +207,7 @@ public class JMSUtil { connectionFailed(me, failedOver); } + @Override public void beforeReconnect(ActiveMQException exception) { System.out.println("MyListener.beforeReconnect"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index 2bac6de..99679e0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -1642,6 +1642,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase { final LinkedList<Long> survivingMsgs = new LinkedList<Long>(); Runnable producerRunnable = new Runnable() { + @Override public void run() { try { while (running.get()) { @@ -1671,11 +1672,14 @@ public class NIOJournalCompactTest extends JournalImplTestBase { storage.commit(tx); ctx.executeOnCompletion(new IOCallback() { + @Override public void onError(int errorCode, String errorMessage) { } + @Override public void done() { deleteExecutor.execute(new Runnable() { + @Override public void run() { try { for (long messageID : values) { @@ -1702,6 +1706,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase { }; Runnable compressRunnable = new Runnable() { + @Override public void run() { try { while (running.get()) { @@ -1751,6 +1756,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase { File[] files = testDir.listFiles(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.startsWith(filePrefix) && name.endsWith(fileExtension); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java index cc49dc6..978406a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java @@ -182,11 +182,13 @@ public class ValidateTransactionHealthTest extends ActiveMQTestBase { this.expectedRecords = expectedRecords; } + @Override public void addPreparedTransaction(final PreparedTransactionInfo preparedTransaction) { numberOfPreparedTransactions++; } + @Override public void addRecord(final RecordInfo info) { if (info.id == lastID) { System.out.println("id = " + info.id + " last id = " + lastID); @@ -205,16 +207,19 @@ public class ValidateTransactionHealthTest extends ActiveMQTestBase { } + @Override public void deleteRecord(final long id) { numberOfDeletes++; } + @Override public void updateRecord(final RecordInfo info) { numberOfUpdates++; } + @Override public void failedTransaction(final long transactionID, final List<RecordInfo> records, final List<RecordInfo> recordsToDelete) { @@ -265,18 +270,23 @@ public class ValidateTransactionHealthTest extends ActiveMQTestBase { journal.start(); journal.load(new LoaderCallback() { + @Override public void addPreparedTransaction(final PreparedTransactionInfo preparedTransaction) { } + @Override public void addRecord(final RecordInfo info) { } + @Override public void deleteRecord(final long id) { } + @Override public void updateRecord(final RecordInfo info) { } + @Override public void failedTransaction(final long transactionID, final List<RecordInfo> records, final List<RecordInfo> recordsToDelete) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/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 f82b677..0d51d9c 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 @@ -228,6 +228,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase { MessageHandler handler = new MessageHandler() { int msgCounter; + @Override public void onMessage(final ClientMessage message) { try { if (delayDelivery > 0) { @@ -673,6 +674,7 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase { pos = 0; } + @Override public TestLargeMessageInputStream clone() { return new TestLargeMessageInputStream(this); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java index 95cbe5c..d5c7b65 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java @@ -52,27 +52,33 @@ public class AcceptorControlUsingCoreTest extends AcceptorControlTest { private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, ResourceNames.CORE_ACCEPTOR + name); + @Override public String getFactoryClassName() { return (String) proxy.retrieveAttributeValue("factoryClassName"); } + @Override public String getName() { return (String) proxy.retrieveAttributeValue("name"); } + @Override @SuppressWarnings("unchecked") public Map<String, Object> getParameters() { return (Map<String, Object>) proxy.retrieveAttributeValue("parameters"); } + @Override public boolean isStarted() { return (Boolean) proxy.retrieveAttributeValue("started"); } + @Override public void start() throws Exception { proxy.invokeOperation("start"); } + @Override public void stop() throws Exception { proxy.invokeOperation("stop"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/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 a7a5181..9ed5433 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 @@ -60,6 +60,7 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes session.start(); } + @Override protected void restartServer() throws Exception { session.close(); @@ -96,30 +97,37 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, ResourceNames.CORE_SERVER); + @Override public boolean isSharedStore() { return (Boolean) proxy.retrieveAttributeValue("sharedStore"); } + @Override public boolean closeConnectionsForAddress(final String ipAddress) throws Exception { return (Boolean) proxy.invokeOperation("closeConnectionsForAddress", ipAddress); } + @Override public boolean closeConsumerConnectionsForAddress(final String address) throws Exception { return (Boolean) proxy.invokeOperation("closeConsumerConnectionsForAddress", address); } + @Override public boolean closeConnectionsForUser(final String userName) throws Exception { return (Boolean) proxy.invokeOperation("closeConnectionsForUser", userName); } + @Override public boolean commitPreparedTransaction(final String transactionAsBase64) throws Exception { return (Boolean) proxy.invokeOperation("commitPreparedTransaction", transactionAsBase64); } + @Override public void createQueue(final String address, final String name) throws Exception { proxy.invokeOperation("createQueue", address, name); } + @Override public void createQueue(final String address, final String name, final String filter, @@ -127,10 +135,12 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("createQueue", address, name, filter, durable); } + @Override public void createQueue(final String address, final String name, final boolean durable) throws Exception { proxy.invokeOperation("createQueue", address, name, durable); } + @Override public void deployQueue(final String address, final String name, final String filter, @@ -138,50 +148,62 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("deployQueue", address, name, filter, durable); } + @Override public void deployQueue(final String address, final String name, final String filterString) throws Exception { proxy.invokeOperation("deployQueue", address, name); } + @Override public void destroyQueue(final String name) throws Exception { proxy.invokeOperation("destroyQueue", name); } + @Override public void disableMessageCounters() throws Exception { proxy.invokeOperation("disableMessageCounters"); } + @Override public void enableMessageCounters() throws Exception { proxy.invokeOperation("enableMessageCounters"); } + @Override public String getBindingsDirectory() { return (String) proxy.retrieveAttributeValue("bindingsDirectory"); } + @Override public int getConnectionCount() { return (Integer) proxy.retrieveAttributeValue("connectionCount"); } + @Override public long getConnectionTTLOverride() { return (Long) proxy.retrieveAttributeValue("connectionTTLOverride", Long.class); } + @Override public Object[] getConnectors() throws Exception { return (Object[]) proxy.retrieveAttributeValue("connectors"); } + @Override public String getConnectorsAsJSON() throws Exception { return (String) proxy.retrieveAttributeValue("connectorsAsJSON"); } + @Override public String[] getAddressNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("addressNames")); } + @Override public String[] getQueueNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("queueNames")); } + @Override public int getIDCacheSize() { return (Integer) proxy.retrieveAttributeValue("IDCacheSize"); } @@ -190,118 +212,147 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("incomingInterceptorClassNames")); } + @Override public String[] getIncomingInterceptorClassNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("incomingInterceptorClassNames")); } + @Override public String[] getOutgoingInterceptorClassNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("outgoingInterceptorClassNames")); } + @Override public String getJournalDirectory() { return (String) proxy.retrieveAttributeValue("journalDirectory"); } + @Override public int getJournalFileSize() { return (Integer) proxy.retrieveAttributeValue("journalFileSize"); } + @Override public int getJournalMaxIO() { return (Integer) proxy.retrieveAttributeValue("journalMaxIO"); } + @Override public int getJournalMinFiles() { return (Integer) proxy.retrieveAttributeValue("journalMinFiles"); } + @Override public String getJournalType() { return (String) proxy.retrieveAttributeValue("journalType"); } + @Override public String getLargeMessagesDirectory() { return (String) proxy.retrieveAttributeValue("largeMessagesDirectory"); } + @Override public String getManagementAddress() { return (String) proxy.retrieveAttributeValue("managementAddress"); } + @Override public String getManagementNotificationAddress() { return (String) proxy.retrieveAttributeValue("managementNotificationAddress"); } + @Override public int getMessageCounterMaxDayCount() { return (Integer) proxy.retrieveAttributeValue("messageCounterMaxDayCount"); } + @Override public long getMessageCounterSamplePeriod() { return (Long) proxy.retrieveAttributeValue("messageCounterSamplePeriod", Long.class); } + @Override public long getMessageExpiryScanPeriod() { return (Long) proxy.retrieveAttributeValue("messageExpiryScanPeriod", Long.class); } + @Override public long getMessageExpiryThreadPriority() { return (Long) proxy.retrieveAttributeValue("messageExpiryThreadPriority", Long.class); } + @Override public String getPagingDirectory() { return (String) proxy.retrieveAttributeValue("pagingDirectory"); } + @Override public int getScheduledThreadPoolMaxSize() { return (Integer) proxy.retrieveAttributeValue("scheduledThreadPoolMaxSize"); } + @Override public int getThreadPoolMaxSize() { return (Integer) proxy.retrieveAttributeValue("threadPoolMaxSize"); } + @Override public long getSecurityInvalidationInterval() { return (Long) proxy.retrieveAttributeValue("securityInvalidationInterval", Long.class); } + @Override public long getTransactionTimeout() { return (Long) proxy.retrieveAttributeValue("transactionTimeout", Long.class); } + @Override public long getTransactionTimeoutScanPeriod() { return (Long) proxy.retrieveAttributeValue("transactionTimeoutScanPeriod", Long.class); } + @Override public String getVersion() { return (String) proxy.retrieveAttributeValue("version"); } + @Override public boolean isBackup() { return (Boolean) proxy.retrieveAttributeValue("backup"); } + @Override public boolean isClustered() { return (Boolean) proxy.retrieveAttributeValue("clustered"); } + @Override public boolean isCreateBindingsDir() { return (Boolean) proxy.retrieveAttributeValue("createBindingsDir"); } + @Override public boolean isCreateJournalDir() { return (Boolean) proxy.retrieveAttributeValue("createJournalDir"); } + @Override public boolean isJournalSyncNonTransactional() { return (Boolean) proxy.retrieveAttributeValue("journalSyncNonTransactional"); } + @Override public boolean isJournalSyncTransactional() { return (Boolean) proxy.retrieveAttributeValue("journalSyncTransactional"); } + @Override public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) throws Exception { proxy.invokeOperation("setFailoverOnServerShutdown", failoverOnServerShutdown); } + @Override public boolean isFailoverOnServerShutdown() { return (Boolean) proxy.retrieveAttributeValue("failoverOnServerShutdown"); } @@ -314,114 +365,142 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes return (Boolean) proxy.retrieveAttributeValue("scaleDown"); } + @Override public boolean isMessageCounterEnabled() { return (Boolean) proxy.retrieveAttributeValue("messageCounterEnabled"); } + @Override public boolean isPersistDeliveryCountBeforeDelivery() { return (Boolean) proxy.retrieveAttributeValue("persistDeliveryCountBeforeDelivery"); } + @Override public boolean isAsyncConnectionExecutionEnabled() { return (Boolean) proxy.retrieveAttributeValue("asyncConnectionExecutionEnabled"); } + @Override public boolean isPersistIDCache() { return (Boolean) proxy.retrieveAttributeValue("persistIDCache"); } + @Override public boolean isSecurityEnabled() { return (Boolean) proxy.retrieveAttributeValue("securityEnabled"); } + @Override public boolean isStarted() { return (Boolean) proxy.retrieveAttributeValue("started"); } + @Override public boolean isWildcardRoutingEnabled() { return (Boolean) proxy.retrieveAttributeValue("wildcardRoutingEnabled"); } + @Override public String[] listConnectionIDs() throws Exception { return (String[]) proxy.invokeOperation("listConnectionIDs"); } + @Override public String[] listPreparedTransactions() throws Exception { return (String[]) proxy.invokeOperation("listPreparedTransactions"); } + @Override public String listPreparedTransactionDetailsAsJSON() throws Exception { return (String) proxy.invokeOperation("listPreparedTransactionDetailsAsJSON"); } + @Override public String listPreparedTransactionDetailsAsHTML() throws Exception { return (String) proxy.invokeOperation("listPreparedTransactionDetailsAsHTML"); } + @Override public String[] listHeuristicCommittedTransactions() throws Exception { return (String[]) proxy.invokeOperation("listHeuristicCommittedTransactions"); } + @Override public String[] listHeuristicRolledBackTransactions() throws Exception { return (String[]) proxy.invokeOperation("listHeuristicRolledBackTransactions"); } + @Override public String[] listRemoteAddresses() throws Exception { return (String[]) proxy.invokeOperation("listRemoteAddresses"); } + @Override public String[] listRemoteAddresses(final String ipAddress) throws Exception { return (String[]) proxy.invokeOperation("listRemoteAddresses", ipAddress); } + @Override public String[] listSessions(final String connectionID) throws Exception { return (String[]) proxy.invokeOperation("listSessions", connectionID); } + @Override public void resetAllMessageCounterHistories() throws Exception { proxy.invokeOperation("resetAllMessageCounterHistories"); } + @Override public void resetAllMessageCounters() throws Exception { proxy.invokeOperation("resetAllMessageCounters"); } + @Override public boolean rollbackPreparedTransaction(final String transactionAsBase64) throws Exception { return (Boolean) proxy.invokeOperation("rollbackPreparedTransaction", transactionAsBase64); } + @Override public void sendQueueInfoToQueue(final String queueName, final String address) throws Exception { proxy.invokeOperation("sendQueueInfoToQueue", queueName, address); } + @Override public void setMessageCounterMaxDayCount(final int count) throws Exception { proxy.invokeOperation("setMessageCounterMaxDayCount", count); } + @Override public void setMessageCounterSamplePeriod(final long newPeriod) throws Exception { proxy.invokeOperation("setMessageCounterSamplePeriod", newPeriod); } + @Override public int getJournalBufferSize() { return (Integer) proxy.retrieveAttributeValue("JournalBufferSize"); } + @Override public int getJournalBufferTimeout() { return (Integer) proxy.retrieveAttributeValue("JournalBufferTimeout"); } + @Override public int getJournalCompactMinFiles() { return (Integer) proxy.retrieveAttributeValue("JournalCompactMinFiles"); } + @Override public int getJournalCompactPercentage() { return (Integer) proxy.retrieveAttributeValue("JournalCompactPercentage"); } + @Override public boolean isPersistenceEnabled() { return (Boolean) proxy.retrieveAttributeValue("PersistenceEnabled"); } + @Override public void addSecuritySettings(String addressMatch, String sendRoles, String consumeRoles, @@ -433,18 +512,22 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("addSecuritySettings", addressMatch, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles); } + @Override public void removeSecuritySettings(String addressMatch) throws Exception { proxy.invokeOperation("removeSecuritySettings", addressMatch); } + @Override public Object[] getRoles(String addressMatch) throws Exception { return (Object[]) proxy.invokeOperation("getRoles", addressMatch); } + @Override public String getRolesAsJSON(String addressMatch) throws Exception { return (String) proxy.invokeOperation("getRolesAsJSON", addressMatch); } + @Override public void addAddressSettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch, @Parameter(desc = "the dead letter address setting", name = "DLA") String DLA, @Parameter(desc = "the expiry address setting", name = "expiryAddress") String expiryAddress, @@ -468,10 +551,12 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("addAddressSettings", addressMatch, DLA, expiryAddress, expiryDelay, lastValueQueue, deliveryAttempts, maxSizeBytes, pageSizeBytes, pageMaxCacheSize, redeliveryDelay, redeliveryMultiplier, maxRedeliveryDelay, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy, slowConsumerThreshold, slowConsumerCheckPeriod, slowConsumerPolicy, autoCreateJmsQueues, autoDeleteJmsQueues); } + @Override public void removeAddressSettings(String addressMatch) throws Exception { proxy.invokeOperation("removeAddressSettings", addressMatch); } + @Override public void createDivert(String name, String routingName, String address, @@ -482,19 +567,23 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("createDivert", name, routingName, address, forwardingAddress, exclusive, filterString, transformerClassName); } + @Override public void destroyDivert(String name) throws Exception { proxy.invokeOperation("destroyDivert", name); } + @Override public String[] getBridgeNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("bridgeNames")); } + @Override public void destroyBridge(String name) throws Exception { proxy.invokeOperation("destroyBridge", name); } + @Override public void forceFailover() throws Exception { proxy.invokeOperation("forceFailover"); } @@ -503,14 +592,17 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes return (String) proxy.retrieveAttributeValue("liveConnectorName"); } + @Override public String getAddressSettingsAsJSON(String addressMatch) throws Exception { return (String) proxy.invokeOperation("getAddressSettingsAsJSON", addressMatch); } + @Override public String[] getDivertNames() { return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("divertNames")); } + @Override public void createBridge(String name, String queueName, String forwardingAddress, @@ -531,6 +623,7 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes proxy.invokeOperation("createBridge", name, queueName, forwardingAddress, filterString, transformerClassName, retryInterval, retryIntervalMultiplier, initialConnectAttempts, reconnectAttempts, useDuplicateDetection, confirmationWindowSize, clientFailureCheckPeriod, connectorNames, useDiscovery, ha, user, password); } + @Override public String listProducersInfoAsJSON() throws Exception { return (String) proxy.invokeOperation("listProducersInfoAsJSON"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java index cf63385..d4cdef2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlUsingCoreTest.java @@ -34,42 +34,52 @@ public class BroadcastGroupControlUsingCoreTest extends BroadcastGroupControlTes return new BroadcastGroupControl() { private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, ResourceNames.CORE_BROADCAST_GROUP + name); + @Override public long getBroadcastPeriod() { return ((Integer) proxy.retrieveAttributeValue("broadcastPeriod")).longValue(); } + @Override public Object[] getConnectorPairs() { return (Object[]) proxy.retrieveAttributeValue("connectorPairs"); } + @Override public String getConnectorPairsAsJSON() { return (String) proxy.retrieveAttributeValue("connectorPairsAsJSON"); } + @Override public String getGroupAddress() { return (String) proxy.retrieveAttributeValue("groupAddress"); } + @Override public int getGroupPort() { return (Integer) proxy.retrieveAttributeValue("groupPort"); } + @Override public int getLocalBindPort() { return (Integer) proxy.retrieveAttributeValue("localBindPort"); } + @Override public String getName() { return (String) proxy.retrieveAttributeValue("name"); } + @Override public boolean isStarted() { return (Boolean) proxy.retrieveAttributeValue("started"); } + @Override public void start() throws Exception { proxy.invokeOperation("start"); } + @Override public void stop() throws Exception { proxy.invokeOperation("stop"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java index d502baa..7715717 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java @@ -49,62 +49,77 @@ public class ClusterConnectionControlUsingCoreTest extends ClusterConnectionCont return new ClusterConnectionControl() { private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, ResourceNames.CORE_CLUSTER_CONNECTION + name); + @Override public Object[] getStaticConnectors() { return (Object[]) proxy.retrieveAttributeValue("staticConnectors"); } + @Override public String getStaticConnectorsAsJSON() throws Exception { return (String) proxy.retrieveAttributeValue("staticConnectorsAsJSON"); } + @Override public String getAddress() { return (String) proxy.retrieveAttributeValue("address"); } + @Override public String getDiscoveryGroupName() { return (String) proxy.retrieveAttributeValue("discoveryGroupName"); } + @Override public int getMaxHops() { return (Integer) proxy.retrieveAttributeValue("maxHops"); } + @Override public long getRetryInterval() { return (Long) proxy.retrieveAttributeValue("retryInterval"); } + @Override public String getTopology() { return (String) proxy.retrieveAttributeValue("topology"); } + @Override public Map<String, String> getNodes() throws Exception { return (Map<String, String>) proxy.retrieveAttributeValue("nodes"); } + @Override public boolean isDuplicateDetection() { return (Boolean) proxy.retrieveAttributeValue("duplicateDetection"); } + @Override public String getMessageLoadBalancingType() { return (String) proxy.retrieveAttributeValue("messageLoadBalancingType"); } + @Override public String getName() { return (String) proxy.retrieveAttributeValue("name"); } + @Override public String getNodeID() { return (String) proxy.retrieveAttributeValue("nodeID"); } + @Override public boolean isStarted() { return (Boolean) proxy.retrieveAttributeValue("started"); } + @Override public void start() throws Exception { proxy.invokeOperation("start"); } + @Override public void stop() throws Exception { proxy.invokeOperation("stop"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java index 62788be..55c90fa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java @@ -47,30 +47,37 @@ public class DivertControlUsingCoreTest extends DivertControlTest { return new DivertControl() { private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, ResourceNames.CORE_DIVERT + name); + @Override public String getAddress() { return (String) proxy.retrieveAttributeValue("address"); } + @Override public String getFilter() { return (String) proxy.retrieveAttributeValue("filter"); } + @Override public String getForwardingAddress() { return (String) proxy.retrieveAttributeValue("forwardingAddress"); } + @Override public String getRoutingName() { return (String) proxy.retrieveAttributeValue("routingName"); } + @Override public String getTransformerClassName() { return (String) proxy.retrieveAttributeValue("transformerClassName"); } + @Override public String getUniqueName() { return (String) proxy.retrieveAttributeValue("uniqueName"); } + @Override public boolean isExclusive() { return (Boolean) proxy.retrieveAttributeValue("exclusive"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index 135a60f..bae0a1c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -2037,6 +2037,7 @@ public class QueueControlTest extends ManagementTestBase { session.start(); } + @Override protected QueueControl createManagementControl(final SimpleString address, final SimpleString queue) throws Exception { QueueControl queueControl = ManagementControlHelper.createQueueControl(address, queue, mbeanServer);
