[jboss-cvs] JBoss Messaging SVN: r7494 - in trunk: src/main/org/jboss/messaging/core/management and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 29 08:52:24 EDT 2009
Author: jmesnil
Date: 2009-06-29 08:52:23 -0400 (Mon, 29 Jun 2009)
New Revision: 7494
Modified:
trunk/docs/user-manual/en/management.xml
trunk/src/main/org/jboss/messaging/core/management/QueueControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/QueueControlImpl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java
trunk/src/main/org/jboss/messaging/jms/server/management/DestinationControlMBean.java
trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControl.java
trunk/src/main/org/jboss/messaging/jms/server/management/TopicControl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControlImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/TopicControlImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java
trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareTopicControlWrapper.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
Log:
JBMESSAGING-1673: MBean operations which requires a filter should treat an empty string as a null filter
* trim the filter before checking it is empty
* unified management methods XXXAllMessages and XXXMatchingMessages to provide an uniform API
* updated doc (+ bits about JBMESSAGING-1672: AS 5 MBean Server integration)
* updated examples
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/docs/user-manual/en/management.xml 2009-06-29 12:52:23 UTC (rev 7494)
@@ -44,6 +44,14 @@
</itemizedlist>
<para>The way to invoke a <emphasis>management operations</emphasis> depends whether JMX, core
messages, or JMS messages are used.</para>
+
+ <note>
+ <para>A few management operations requires a <literal>filter</literal> parameter to chose which
+ messages are involved by the operation. Passing
+ <literal>null</literal> or an empty string means that the management operation will be performed
+ on <emphasis>all messages</emphasis>.</para>
+ </note>
+
<section>
<title>Core Management API</title>
<para>JBoss Messaging defines a core management API to manage core resources. For full
@@ -143,7 +151,7 @@
dead letter address can be set with the <literal
>setDeadLetterAddress()</literal> method.</para>
<para>Messages can also be moved from a queue to another queue by using the
- <literal>moveMatchingMessages()</literal> method.</para>
+ <literal>moveMessages()</literal> method.</para>
</listitem>
<listitem>
<para>Listing and removing messages</para>
@@ -151,7 +159,7 @@
>listMessages()</literal> method which returns an array of <literal
>Map</literal>, one <literal>Map</literal> for each message.</para>
<para>Messages can also be removed from the queue by using the <literal
- >removeMatchingMessages()</literal> method which returns a <literal
+ >removeMessages()</literal> method which returns a <literal
>boolean</literal> for the single message ID variant or the number of
removed messages for the filter variant.</para>
</listitem>
@@ -351,7 +359,7 @@
dead letter address can be set with the <literal
>setDeadLetterAddress()</literal> method.</para>
<para>Messages can also be moved from a queue to another queue by using the
- <literal>moveMatchingMessages()</literal> method.</para>
+ <literal>moveMessages()</literal> method.</para>
</listitem>
<listitem>
<para>Listing and removing messages</para>
@@ -359,7 +367,7 @@
>listMessages()</literal> method which returns an array of <literal
>Map</literal>, one <literal>Map</literal> for each message.</para>
<para>Messages can also be removed from the queue by using the <literal
- >removeMatchingMessages()</literal> method which returns a <literal
+ >removeMessages()</literal> method which returns a <literal
>boolean</literal> for the single message ID variant or the number of
removed messages for the filter variant.</para>
</listitem>
@@ -465,17 +473,32 @@
Management guide</ulink> to configure the server for remote management (system
properties must be set in <literal>run.sh</literal> or <literal>run.bat</literal>
scripts).</para>
- <para>By default, JBoss Messaging uses the Java Virtual Machine's <literal>Platform
+
+ <section>
+ <title>MBeanServer configuration</title>
+
+ <para>When JBoss Messaging is run in standalone, it uses the Java Virtual Machine's <literal>Platform
MBeanServer</literal> to register its MBeans. This is configured in JBoss
Microcontainer Beans file (see <xref linkend="server.microcontainer.configuration"
/>):</para>
- <programlisting><!-- MBeanServer -->
+ <programlisting><!-- MBeanServer -->
<bean name="MBeanServer" class="javax.management.MBeanServer">
<constructor factoryClass="java.lang.management.ManagementFactory"
factoryMethod="getPlatformMBeanServer" />
</bean>
- </programlisting>
+ </programlisting>
+
+ <para>When it is integrated in JBoss AS 5, it uses the Application Server's own
+ MBean Server so that it can be managed using AS 5's jmx-console:</para>
+ <programlisting><!-- MBeanServer -->
+<bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="org.jboss.mx.util.MBeanServerLocator"
+ factoryMethod="locateJBoss" />
+</bean>
+ </programlisting>
+ </section>
</section>
+
<section>
<title>Example</title>
<para>See <xref linkend="examples.jmx" /> for an example which
Modified: trunk/src/main/org/jboss/messaging/core/management/QueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/QueueControl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/core/management/QueueControl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -79,33 +79,24 @@
@Operation(desc = "List the messages scheduled for delivery and returns them using JSON", impact = INFO)
String listScheduledMessagesAsJSON() throws Exception;
- @Operation(desc = "List all the messages in the queue", impact = INFO)
- Map<String, Object>[] listAllMessages() throws Exception;
-
- @Operation(desc = "List all the messages in the queue and return them using JSON", impact = INFO)
- String listAllMessagesAsJSON() throws Exception;
-
@Operation(desc = "List all the messages in the queue matching the given filter", impact = INFO)
- Map<String, Object>[] listMessages(@Parameter(name = "filter", desc = "A message filter")
+ Map<String, Object>[] listMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "List all the messages in the queue matching the given filter and returns them using JSON", impact = INFO)
- String listMessagesAsJSON(@Parameter(name = "filter", desc = "A message filter")
+ String listMessagesAsJSON(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Returns the number of the messages in the queue matching the given filter", impact = INFO)
- int countMessages(@Parameter(name = "filter", desc = "A message filter")
+ int countMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
- @Operation(desc = "Remove all the messages from the queue", impact = ACTION)
- int removeAllMessages() throws Exception;
-
@Operation(desc = "Remove the message corresponding to the given messageID", impact = ACTION)
boolean removeMessage(@Parameter(name = "messageID", desc = "A message ID")
long messageID) throws Exception;
@Operation(desc = "Remove the messages corresponding to the given filter (and returns the number of removed messages)", impact = ACTION)
- int removeMatchingMessages(@Parameter(name = "filter", desc = "A message filter")
+ int removeMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Remove the messages corresponding to the given filter (and returns the number of expired messages)", impact = ACTION)
@@ -122,14 +113,10 @@
String otherQueueName) throws Exception;
@Operation(desc = "Move the messages corresponding to the given filter (and returns the number of moved messages)", impact = ACTION)
- int moveMatchingMessages(@Parameter(name = "filter", desc = "A message filter")
+ int moveMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter, @Parameter(name = "otherQueueName", desc = "The name of the queue to move the messages to")
String otherQueueName) throws Exception;
- @Operation(desc = "Move all the messages to another queue (and returns the number of moved messages)", impact = ACTION)
- int moveAllMessages(@Parameter(name = "otherQueueName", desc = "The name of the queue to move the messages to")
- String otherQueueName) throws Exception;
-
@Operation(desc = "Send the message corresponding to the given messageID to this queue's Dead Letter Address", impact = ACTION)
boolean sendMessageToDeadLetterAddress(@Parameter(name = "messageID", desc = "A message ID")
long messageID) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/QueueControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/QueueControlImpl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/QueueControlImpl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -84,7 +84,7 @@
*/
public static Filter createFilter(final String filterStr) throws MessagingException
{
- if (filterStr == null || filterStr.length() == 0)
+ if (filterStr == null || filterStr.trim().length() == 0)
{
return null;
} else
@@ -225,16 +225,6 @@
}
}
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- return listMessages(null);
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return toJSON(listAllMessages());
- }
-
public Map<String, Object>[] listScheduledMessages() throws Exception
{
List<MessageReference> refs = queue.getScheduledMessages();
@@ -286,18 +276,6 @@
return refs.size();
}
- public int removeAllMessages() throws Exception
- {
- try
- {
- return queue.deleteAllReferences();
- }
- catch (MessagingException e)
- {
- throw new IllegalStateException(e.getMessage());
- }
- }
-
public boolean removeMessage(final long messageID) throws Exception
{
try
@@ -310,7 +288,7 @@
}
}
- public int removeMatchingMessages(final String filterStr) throws Exception
+ public int removeMessages(final String filterStr) throws Exception
{
Filter filter = createFilter(filterStr);
return queue.deleteMatchingReferences(filter);
@@ -346,7 +324,7 @@
return queue.moveReference(messageID, binding.getAddress());
}
- public int moveMatchingMessages(final String filterStr, final String otherQueueName) throws Exception
+ public int moveMessages(final String filterStr, final String otherQueueName) throws Exception
{
Filter filter = createFilter(filterStr);
@@ -360,11 +338,6 @@
return queue.moveReferences(filter, binding.getAddress());
}
- public int moveAllMessages(String otherQueueName) throws Exception
- {
- return moveMatchingMessages(null, otherQueueName);
- }
-
public int sendMessagesToDeadLetterAddress(final String filterStr) throws Exception
{
Filter filter = createFilter(filterStr);
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareQueueControlWrapper.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -141,16 +141,6 @@
return localQueueControl.isTemporary();
}
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- return localQueueControl.listAllMessages();
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return localQueueControl.listAllMessagesAsJSON();
- }
-
public String listMessageCounter() throws Exception
{
return localQueueControl.listMessageCounter();
@@ -221,31 +211,21 @@
return (Integer)replicationAwareInvoke("expireMessages", filter);
}
- public int moveAllMessages(final String otherQueueName) throws Exception
+ public int moveMessages(final String filter, final String otherQueueName) throws Exception
{
- return (Integer)replicationAwareInvoke("moveAllMessages", otherQueueName);
+ return (Integer)replicationAwareInvoke("moveMessages", filter, otherQueueName);
}
- public int moveMatchingMessages(final String filter, final String otherQueueName) throws Exception
- {
- return (Integer)replicationAwareInvoke("moveMatchingMessages", filter, otherQueueName);
- }
-
public boolean moveMessage(final long messageID, final String otherQueueName) throws Exception
{
return (Boolean)replicationAwareInvoke("moveMessage", messageID, otherQueueName);
}
- public int removeAllMessages() throws Exception
+ public int removeMessages(final String filter) throws Exception
{
- return (Integer)replicationAwareInvoke("removeAllMessages");
+ return (Integer)replicationAwareInvoke("removeMessages", filter);
}
- public int removeMatchingMessages(final String filter) throws Exception
- {
- return (Integer)replicationAwareInvoke("removeMatchingMessages", filter);
- }
-
public boolean removeMessage(final long messageID) throws Exception
{
return (Boolean)replicationAwareInvoke("removeMessage", messageID);
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/DestinationControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/DestinationControlMBean.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/DestinationControlMBean.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -25,6 +25,7 @@
import static javax.management.MBeanOperationInfo.ACTION;
import org.jboss.messaging.core.management.Operation;
+import org.jboss.messaging.core.management.Parameter;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -48,7 +49,7 @@
// Operations ----------------------------------------------------
- @Operation(desc = "Remove all the messages from the destination", impact = ACTION)
- int removeAllMessages() throws Exception;
+ @Operation(desc = "Remove messages from the destination", impact = ACTION)
+ int removeMessages(@Parameter(name = "filter", desc = "A JMS message filter (can be empty)") String filter) throws Exception;
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -68,22 +68,16 @@
// Operations ----------------------------------------------------
- @Operation(desc = "List all messages in the queue", impact = INFO)
- Map<String, Object>[] listAllMessages() throws Exception;
-
- @Operation(desc = "List all messages in the queue using JSON", impact = INFO)
- String listAllMessagesAsJSON() throws Exception;
-
@Operation(desc = "List all messages in the queue which matches the filter", impact = INFO)
Map<String, Object>[] listMessages(@Parameter(name = "filter", desc = "A JMS Message filter")
String filter) throws Exception;
@Operation(desc = "List all messages in the queue which matches the filter and return them using JSON", impact = INFO)
- String listMessagesAsJSON(@Parameter(name = "filter", desc = "A JMS Message filter")
+ String listMessagesAsJSON(@Parameter(name = "filter", desc = "A JMS Message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Returns the number of the messages in the queue matching the given filter", impact = INFO)
- int countMessages(@Parameter(name = "filter", desc = "A JMS message filter")
+ int countMessages(@Parameter(name = "filter", desc = "A JMS message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Remove the message corresponding to the given messageID", impact = ACTION)
@@ -91,11 +85,11 @@
String messageID) throws Exception;
@Operation(desc = "Remove the messages corresponding to the given filter (and returns the number of removed messages)", impact = ACTION)
- int removeMatchingMessages(@Parameter(name = "filter", desc = "A message filter")
+ int removeMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Expire the messages corresponding to the given filter (and returns the number of expired messages)", impact = ACTION)
- int expireMessages(@Parameter(name = "filter", desc = "A message filter")
+ int expireMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter) throws Exception;
@Operation(desc = "Expire the message corresponding to the given messageID", impact = ACTION)
@@ -117,14 +111,10 @@
String otherQueueName) throws Exception;
@Operation(desc = "Move the messages corresponding to the given filter (and returns the number of moved messages)", impact = ACTION)
- int moveMatchingMessages(@Parameter(name = "filter", desc = "A message filter")
+ int moveMessages(@Parameter(name = "filter", desc = "A message filter (can be empty)")
String filter, @Parameter(name = "otherQueueName", desc = "The name of the queue to move the messages to")
String otherQueueName) throws Exception;
- @Operation(desc = "Move all the messages to another queue (and returns the number of moved messages)", impact = ACTION)
- int moveAllMessages(@Parameter(name = "otherQueueName", desc = "The name of the queue to move the messages to")
- String otherQueueName) throws Exception;
-
String listMessageCounter() throws Exception;
String listMessageCounterAsHTML() throws Exception;
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/TopicControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/TopicControl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/TopicControl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -83,7 +83,7 @@
public int countMessagesForSubscription(
@Parameter(name = "clientID", desc = "the client ID") String clientID,
@Parameter(name = "subscriptionName", desc = "the name of the durable subscription") String subscriptionName,
- @Parameter(name = "filter", desc = "a JMS filter") String filter)
+ @Parameter(name = "filter", desc = "a JMS filter (can be empty)") String filter)
throws Exception;
@Operation(desc = "Drop a durable subscription", impact = ACTION)
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControlImpl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControlImpl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -66,7 +66,7 @@
*/
public static String createFilterFromJMSSelector(final String selectorStr) throws MessagingException
{
- return (selectorStr == null || selectorStr.length() == 0) ? null : SelectorTranslator.convertToJBMFilterString(selectorStr);
+ return (selectorStr == null || selectorStr.trim().length() == 0) ? null : SelectorTranslator.convertToJBMFilterString(selectorStr);
}
private static String createFilterForJMSMessageID(String jmsMessageID) throws Exception
@@ -175,7 +175,7 @@
public boolean removeMessage(final String messageID) throws Exception
{
String filter = createFilterForJMSMessageID(messageID);
- int removed = coreQueueControl.removeMatchingMessages(filter);
+ int removed = coreQueueControl.removeMessages(filter);
if (removed != 1)
{
throw new IllegalArgumentException("No message found for JMSMessageID: " + messageID);
@@ -183,27 +183,12 @@
return true;
}
- public int removeMatchingMessages(String filterStr) throws Exception
+ public int removeMessages(String filterStr) throws Exception
{
String filter = createFilterFromJMSSelector(filterStr);
- return coreQueueControl.removeMatchingMessages(filter);
+ return coreQueueControl.removeMessages(filter);
}
- public int removeAllMessages() throws Exception
- {
- return coreQueueControl.removeAllMessages();
- }
-
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- return listMessages(null);
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return toJSON(listMessages(null));
- }
-
public Map<String, Object>[] listMessages(final String filterStr) throws Exception
{
try
@@ -282,7 +267,7 @@
{
String filter = createFilterForJMSMessageID(messageID);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
- int moved = coreQueueControl.moveMatchingMessages(filter, otherQueue.getAddress());
+ int moved = coreQueueControl.moveMessages(filter, otherQueue.getAddress());
if (moved != 1)
{
throw new IllegalArgumentException("No message found for JMSMessageID: " + messageID);
@@ -291,18 +276,13 @@
return true;
}
- public int moveMatchingMessages(String filterStr, String otherQueueName) throws Exception
+ public int moveMessages(String filterStr, String otherQueueName) throws Exception
{
String filter = createFilterFromJMSSelector(filterStr);
JBossQueue otherQueue = new JBossQueue(otherQueueName);
- return coreQueueControl.moveMatchingMessages(filter, otherQueue.getAddress());
+ return coreQueueControl.moveMessages(filter, otherQueue.getAddress());
}
- public int moveAllMessages(String otherQueueName) throws Exception
- {
- return moveMatchingMessages(null, otherQueueName);
- }
-
public String listMessageCounter()
{
try
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/TopicControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/TopicControlImpl.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/TopicControlImpl.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -68,7 +68,7 @@
public static String createFilterFromJMSSelector(final String selectorStr) throws MessagingException
{
- return (selectorStr == null || selectorStr.length() == 0) ? null : SelectorTranslator.convertToJBMFilterString(selectorStr);
+ return (selectorStr == null || selectorStr.trim().length() == 0) ? null : SelectorTranslator.convertToJBMFilterString(selectorStr);
}
// Constructors --------------------------------------------------
@@ -174,7 +174,7 @@
throw new IllegalArgumentException("No subscriptions with name " + queueName);
}
- Map<String, Object>[] coreMessages = coreQueueControl.listAllMessages();
+ Map<String, Object>[] coreMessages = coreQueueControl.listMessages(null);
Map<String, Object>[] jmsMessages = new Map[coreMessages.length];
@@ -204,14 +204,15 @@
return coreQueueControl.listMessages(filter).length;
}
- public int removeAllMessages() throws Exception
+ public int removeMessages(String filterStr) throws Exception
{
+ String filter = createFilterFromJMSSelector(filterStr);
int count = 0;
String[] queues = addressControl.getQueueNames();
for (String queue : queues)
{
QueueControl coreQueueControl = (QueueControl)managementService.getResource(ResourceNames.CORE_QUEUE + queue);
- count += coreQueueControl.removeAllMessages();
+ count += coreQueueControl.removeMessages(filter);
}
return count;
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSQueueControlWrapper.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -119,16 +119,6 @@
return localControl.isTemporary();
}
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- return localControl.listAllMessages();
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return localControl.listAllMessagesAsJSON();
- }
-
public String listMessageCounter()
{
return localControl.listMessageCounter();
@@ -189,24 +179,19 @@
return (Integer)replicationAwareInvoke("expireMessages", filter);
}
- public int moveAllMessages(final String otherQueueName) throws Exception
+ public int moveMessages(final String filter, final String otherQueueName) throws Exception
{
- return (Integer)replicationAwareInvoke("moveAllMessages", otherQueueName);
+ return (Integer)replicationAwareInvoke("moveMessages", filter, otherQueueName);
}
- public int moveMatchingMessages(final String filter, final String otherQueueName) throws Exception
- {
- return (Integer)replicationAwareInvoke("moveMatchingMessages", filter, otherQueueName);
- }
-
public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception
{
return (Boolean)replicationAwareInvoke("moveMessage", messageID, otherQueueName);
}
- public int removeMatchingMessages(final String filter) throws Exception
+ public int removeMessages(final String filter) throws Exception
{
- return (Integer)replicationAwareInvoke("removeMatchingMessages", filter);
+ return (Integer)replicationAwareInvoke("removeMessages", filter);
}
public boolean removeMessage(final String messageID) throws Exception
@@ -224,11 +209,6 @@
replicationAwareInvoke("setExpiryAddress", expiryAddress);
}
- public int removeAllMessages() throws Exception
- {
- return (Integer)replicationAwareInvoke("removeAllMessages");
- }
-
// StandardMBean overrides ---------------------------------------
@Override
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareTopicControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareTopicControlWrapper.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareTopicControlWrapper.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -167,9 +167,9 @@
return localControl.isTemporary();
}
- public int removeAllMessages() throws Exception
+ public int removeMessages(String filter) throws Exception
{
- return (Integer)replicationAwareInvoke("removeAllMessages");
+ return (Integer)replicationAwareInvoke("removeMessages", filter);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -85,23 +85,23 @@
assertEquals(1, liveQueueControl.getMessageCount());
assertEquals(1, backupQueueControl.getMessageCount());
- Map<String, Object>[] messages = liveQueueControl.listAllMessages();
+ Map<String, Object>[] messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
assertEquals(oldPriority, messages[0].get("priority"));
- messages = backupQueueControl.listAllMessages();
+ messages = backupQueueControl.listMessages(null);
assertEquals(1, messages.length);
assertEquals(oldPriority, messages[0].get("priority"));
assertTrue(liveQueueControl.changeMessagePriority(messageID, newPriority));
// check the priority is changed on both live & backup nodes
- messages = liveQueueControl.listAllMessages();
+ messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
assertEquals(newPriority, messages[0].get("priority"));
- messages = backupQueueControl.listAllMessages();
+ messages = backupQueueControl.listMessages(null);
assertEquals(1, messages.length);
assertEquals(newPriority, messages[0].get("priority"));
}
@@ -122,7 +122,7 @@
assertEquals(1, liveQueueControl.getMessageCount());
assertEquals(1, backupQueueControl.getMessageCount());
- Map<String, Object>[] messages = liveQueueControl.listAllMessages();
+ Map<String, Object>[] messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -195,7 +195,7 @@
assertEquals(0, backupOtherQueueControl.getMessageCount());
// moved all messages to otherQueue
- int movedMessagesCount = liveQueueControl.moveAllMessages(otherQueue.toString());
+ int movedMessagesCount = liveQueueControl.moveMessages(null, otherQueue.toString());
assertEquals(1, movedMessagesCount);
assertEquals(0, liveQueueControl.getMessageCount());
@@ -236,7 +236,7 @@
assertEquals(0, backupOtherQueueControl.getMessageCount());
// moved matching messages to otherQueue
- int movedMatchedMessagesCount = liveQueueControl.moveMatchingMessages(key + " =" + matchingValue,
+ int movedMatchedMessagesCount = liveQueueControl.moveMessages(key + " =" + matchingValue,
otherQueue.toString());
assertEquals(1, movedMatchedMessagesCount);
@@ -272,7 +272,7 @@
assertEquals(0, liveOtherQueueControl.getMessageCount());
assertEquals(0, backupOtherQueueControl.getMessageCount());
- Map<String, Object>[] messages = liveQueueControl.listAllMessages();
+ Map<String, Object>[] messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -304,7 +304,7 @@
assertEquals(1, backupQueueControl.getMessageCount());
// remove all messages
- int count = liveQueueControl.removeAllMessages();
+ int count = liveQueueControl.removeMessages(null);
assertEquals(1, count);
// check there are no messages on both live & backup nodes
@@ -334,7 +334,7 @@
assertEquals(2, backupQueueControl.getMessageCount());
// removed matching messages
- int removedMatchedMessagesCount = liveQueueControl.removeMatchingMessages(key + " =" + matchingValue);
+ int removedMatchedMessagesCount = liveQueueControl.removeMessages(key + " =" + matchingValue);
assertEquals(1, removedMatchedMessagesCount);
assertEquals(1, liveQueueControl.getMessageCount());
@@ -357,7 +357,7 @@
assertEquals(1, liveQueueControl.getMessageCount());
assertEquals(1, backupQueueControl.getMessageCount());
- Map<String, Object>[] messages = liveQueueControl.listAllMessages();
+ Map<String, Object>[] messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -384,7 +384,7 @@
assertEquals(1, liveQueueControl.getMessageCount());
assertEquals(1, backupQueueControl.getMessageCount());
- Map<String, Object>[] messages = liveQueueControl.listAllMessages();
+ Map<String, Object>[] messages = liveQueueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -448,7 +448,7 @@
if (messageCount > 0)
{
- queueControl.removeAllMessages();
+ queueControl.removeMessages(null);
}
return true;
}
@@ -473,7 +473,7 @@
managementService = server1.getManagementService();
}
JMSQueueControl queueControl = (JMSQueueControl)managementService.getResource(ResourceNames.JMS_QUEUE + queueName);
- queueControl.removeAllMessages();
+ queueControl.removeMessages(null);
}
protected TransactionManager newTransactionManager()
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -22,14 +22,6 @@
package org.jboss.messaging.tests.integration.jms.cluster.management;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
-import org.jboss.messaging.jms.server.management.JMSQueueControl;
-import org.jboss.messaging.tests.integration.cluster.management.ReplicationAwareTestBase;
-import org.jboss.messaging.tests.integration.jms.server.management.JMSUtil;
-import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
@@ -40,6 +32,15 @@
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
+import org.jboss.messaging.jms.server.management.JMSQueueControl;
+import org.jboss.messaging.tests.integration.cluster.management.ReplicationAwareTestBase;
+import org.jboss.messaging.tests.integration.jms.server.management.JMSUtil;
+import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
+
/**
* A ReplicationAwareQueueControlWrapperTest
*
@@ -146,7 +147,7 @@
assertEquals(0, backupOtherQueueControl.getMessageCount());
// moved all messages to otherQueue
- int movedMessagesCount = liveQueueControl.moveAllMessages(otherQueue.getName());
+ int movedMessagesCount = liveQueueControl.moveMessages(null, otherQueue.getName());
assertEquals(1, movedMessagesCount);
assertEquals(0, liveQueueControl.getMessageCount());
@@ -171,7 +172,7 @@
assertEquals(0, backupOtherQueueControl.getMessageCount());
// moved matching messages to otherQueue
- int movedMatchedMessagesCount = liveQueueControl.moveMatchingMessages(key + " =" + matchingValue, otherQueue.getName());
+ int movedMatchedMessagesCount = liveQueueControl.moveMessages(key + " =" + matchingValue, otherQueue.getName());
assertEquals(1, movedMatchedMessagesCount);
assertEquals(1, liveQueueControl.getMessageCount());
@@ -213,7 +214,7 @@
assertEquals(1, backupQueueControl.getMessageCount());
// remove all messages
- int count = liveQueueControl.removeAllMessages();
+ int count = liveQueueControl.removeMessages(null);
assertEquals(1, count);
// check there are no messages on both live & backup nodes
@@ -235,7 +236,7 @@
assertEquals(2, backupQueueControl.getMessageCount());
// removed matching messages
- int removedMatchedMessagesCount = liveQueueControl.removeMatchingMessages(key + " =" + matchingValue);
+ int removedMatchedMessagesCount = liveQueueControl.removeMessages(key + " =" + matchingValue);
assertEquals(1, removedMatchedMessagesCount);
assertEquals(1, liveQueueControl.getMessageCount());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -22,6 +22,23 @@
package org.jboss.messaging.tests.integration.jms.server.management;
+import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.naming.Context;
+
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
@@ -35,26 +52,11 @@
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.JMSQueueControl;
import org.jboss.messaging.tests.integration.management.ManagementControlHelper;
-import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
import org.jboss.messaging.tests.integration.management.ManagementTestBase;
import org.jboss.messaging.tests.unit.util.InVMContext;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import org.jboss.messaging.utils.SimpleString;
import org.jboss.messaging.utils.json.JSONArray;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.Context;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
/**
* A QueueControlTest
*
@@ -125,7 +127,7 @@
connection.close();
}
- public void testListAllMessages() throws Exception
+ public void testListMessagesWithNullFilter() throws Exception
{
JMSQueueControl queueControl = createManagementControl();
@@ -135,7 +137,7 @@
assertEquals(2, queueControl.getMessageCount());
- Map<String, Object>[] data = queueControl.listAllMessages();
+ Map<String, Object>[] data = queueControl.listMessages(null);
assertEquals(2, data.length);
System.out.println(data[0].keySet());
assertEquals(ids[0], data[0].get("JMSMessageID").toString());
@@ -143,11 +145,11 @@
JMSUtil.consumeMessages(2, queue);
- data = queueControl.listAllMessages();
+ data = queueControl.listMessages(null);
assertEquals(0, data.length);
}
- public void testListAllMessagesAsJSON() throws Exception
+ public void testListMessagesAsJSONWithNullFilter() throws Exception
{
JMSQueueControl queueControl = createManagementControl();
@@ -157,7 +159,7 @@
assertEquals(2, queueControl.getMessageCount());
- String jsonString = queueControl.listAllMessagesAsJSON();
+ String jsonString = queueControl.listMessagesAsJSON(null);
assertNotNull(jsonString);
JSONArray array = new JSONArray(jsonString);
assertEquals(2, array.length());
@@ -166,7 +168,7 @@
JMSUtil.consumeMessages(2, queue);
- jsonString = queueControl.listAllMessagesAsJSON();
+ jsonString = queueControl.listMessagesAsJSON(null);
assertNotNull(jsonString);
array = new JSONArray(jsonString);
assertEquals(0, array.length());
@@ -182,7 +184,7 @@
assertEquals(2, queueControl.getMessageCount());
- Map<String, Object>[] data = queueControl.listAllMessages();
+ Map<String, Object>[] data = queueControl.listMessages(null);
assertEquals(2, data.length);
System.out.println(data[0]);
@@ -228,7 +230,7 @@
assertEquals(2, queueControl.getMessageCount());
- queueControl.removeAllMessages();
+ queueControl.removeMessages(null);
assertEquals(0, queueControl.getMessageCount());
@@ -262,7 +264,7 @@
assertEquals(2, queueControl.getMessageCount());
- int removedMatchingMessagesCount = queueControl.removeMatchingMessages("foo = 'bar'");
+ int removedMatchingMessagesCount = queueControl.removeMessages("foo = 'bar'");
assertEquals(1, removedMatchingMessagesCount);
assertEquals(1, queueControl.getMessageCount());
@@ -284,7 +286,7 @@
assertEquals(1, queueControl.getMessageCount());
- Map<String, Object>[] data = queueControl.listAllMessages();
+ Map<String, Object>[] data = queueControl.listMessages(null);
// retrieve the first message info
String messageID = (String)data[0].get("JMSMessageID");
int currentPriority = ((Number)data[0].get("JMSPriority")).intValue();
@@ -566,7 +568,7 @@
}
- public void testMoveAllMessages() throws Exception
+ public void testMoveMessages() throws Exception
{
String otherQueueName = randomString();
@@ -580,7 +582,7 @@
assertEquals(2, queueControl.getMessageCount());
// moved all messages to otherQueue
- int movedMessagesCount = queueControl.moveAllMessages(otherQueueName);
+ int movedMessagesCount = queueControl.moveMessages(null, otherQueueName);
assertEquals(2, movedMessagesCount);
assertEquals(0, queueControl.getMessageCount());
@@ -593,7 +595,7 @@
serverManager.destroyQueue(otherQueueName);
}
- public void testMoveAllMessagesToUknownQueue() throws Exception
+ public void testMoveMessagesToUknownQueue() throws Exception
{
String unknownQueue = randomString();
@@ -601,7 +603,7 @@
try
{
- queueControl.moveAllMessages(unknownQueue);
+ queueControl.moveMessages(null, unknownQueue);
fail();
}
catch (Exception e)
@@ -630,7 +632,7 @@
assertEquals(2, queueControl.getMessageCount());
// moved matching messages to otherQueue
- int movedMessagesCount = queueControl.moveMatchingMessages(filter, otherQueueName);
+ int movedMessagesCount = queueControl.moveMessages(filter, otherQueueName);
assertEquals(1, movedMessagesCount);
assertEquals(1, queueControl.getMessageCount());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -161,22 +161,6 @@
return (Boolean)proxy.retrieveAttributeValue("temporary");
}
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- Object[] res = (Object[])proxy.invokeOperation("listAllMessages");
- Map<String, Object>[] results = new Map[res.length];
- for (int i = 0; i < res.length; i++)
- {
- results[i] = (Map<String, Object>)res[i];
- }
- return results;
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return (String)proxy.invokeOperation("listAllMessagesAsJSON");
- }
-
public String listMessageCounter() throws Exception
{
return (String)proxy.invokeOperation("listMessageCounter");
@@ -213,24 +197,19 @@
return (String)proxy.invokeOperation("listMessagesAsJSON", filter);
}
- public int moveAllMessages(String otherQueueName) throws Exception
+ public int moveMessages(String filter, String otherQueueName) throws Exception
{
- return (Integer)proxy.invokeOperation("moveAllMessages", otherQueueName);
+ return (Integer)proxy.invokeOperation("moveMessages", filter, otherQueueName);
}
- public int moveMatchingMessages(String filter, String otherQueueName) throws Exception
- {
- return (Integer)proxy.invokeOperation("moveMatchingMessages", filter, otherQueueName);
- }
-
public boolean moveMessage(String messageID, String otherQueueName) throws Exception
{
return (Boolean)proxy.invokeOperation("moveMessage", messageID, otherQueueName);
}
- public int removeMatchingMessages(String filter) throws Exception
+ public int removeMessages(String filter) throws Exception
{
- return (Integer)proxy.invokeOperation("removeMatchingMessages", filter);
+ return (Integer)proxy.invokeOperation("removeMessages", filter);
}
public boolean removeMessage(String messageID) throws Exception
@@ -262,12 +241,6 @@
{
return (String)proxy.retrieveAttributeValue("JNDIBinding");
}
-
- public int removeAllMessages() throws Exception
- {
- return (Integer)proxy.invokeOperation("removeAllMessages");
- }
-
};
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -328,7 +328,7 @@
TopicControl topicControl = createManagementControl();
assertEquals(3 * 2, topicControl.getMessageCount());
- int removedCount = topicControl.removeAllMessages();
+ int removedCount = topicControl.removeMessages(null);
assertEquals(3 * 2, removedCount);
assertEquals(0, topicControl.getMessageCount());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -277,7 +277,7 @@
assertEquals(3 * 2, proxy.retrieveAttributeValue("messageCount"));
- int removedCount = (Integer)proxy.invokeOperation("removeAllMessages");
+ int removedCount = (Integer)proxy.invokeOperation("removeMessages", "");
assertEquals(3 * 2, removedCount);
assertEquals(0, proxy.retrieveAttributeValue("messageCount"));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -378,34 +378,8 @@
consumer.close();
session.deleteQueue(queue);
}
-
- public void testListAllMessages() throws Exception
- {
- SimpleString address = randomSimpleString();
- SimpleString queue = randomSimpleString();
- int intValue = randomInt();
- session.createQueue(address, queue, null, false);
-
- QueueControl queueControl = createManagementControl(address, queue);
-
- ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
- message.putIntProperty(new SimpleString("key"), intValue);
- producer.send(message);
-
- Map<String, Object>[] messages = queueControl.listAllMessages();
- assertEquals(1, messages.length);
- assertEquals(intValue, ((Number)messages[0].get("key")).intValue());
-
- consumeMessages(1, session, queue);
-
- messages = queueControl.listAllMessages();
- assertEquals(0, messages.length);
-
- session.deleteQueue(queue);
- }
- public void testListAllMessagesAsJSON() throws Exception
+ public void testListMessagesAsJSONWithNullFilter() throws Exception
{
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
@@ -419,7 +393,7 @@
message.putIntProperty(new SimpleString("key"), intValue);
producer.send(message);
- String jsonString = queueControl.listAllMessagesAsJSON();
+ String jsonString = queueControl.listMessagesAsJSON(null);
assertNotNull(jsonString);
JSONArray array = new JSONArray(jsonString);
assertEquals(1, array.length());
@@ -427,7 +401,7 @@
consumeMessages(1, session, queue);
- jsonString = queueControl.listAllMessagesAsJSON();
+ jsonString = queueControl.listMessagesAsJSON(null);
assertNotNull(jsonString);
array = new JSONArray(jsonString);
assertEquals(0, array.length());
@@ -468,6 +442,52 @@
session.deleteQueue(queue);
}
+ public void testListMessagesWithNullFilter() throws Exception
+ {
+ SimpleString address = randomSimpleString();
+ SimpleString queue = randomSimpleString();
+
+ session.createQueue(address, queue, null, false);
+ QueueControl queueControl = createManagementControl(address, queue);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+ producer.send(session.createClientMessage(false));
+
+ Map<String, Object>[] messages = queueControl.listMessages(null);
+ assertEquals(2, messages.length);
+
+ consumeMessages(2, session, queue);
+
+ messages = queueControl.listMessages(null);
+ assertEquals(0, messages.length);
+
+ session.deleteQueue(queue);
+ }
+
+ public void testListMessagesWithEmptyFilter() throws Exception
+ {
+ SimpleString address = randomSimpleString();
+ SimpleString queue = randomSimpleString();
+
+ session.createQueue(address, queue, null, false);
+ QueueControl queueControl = createManagementControl(address, queue);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+ producer.send(session.createClientMessage(false));
+
+ Map<String, Object>[] messages = queueControl.listMessages("");
+ assertEquals(2, messages.length);
+
+ consumeMessages(2, session, queue);
+
+ messages = queueControl.listMessages("");
+ assertEquals(0, messages.length);
+
+ session.deleteQueue(queue);
+ }
+
public void testListMessagesAsJSONWithFilter() throws Exception
{
SimpleString key = new SimpleString("key");
@@ -513,7 +533,7 @@
* <li>consume the message from otherQueue</li>
* </ol>
*/
- public void testMoveAllMessages() throws Exception
+ public void testMoveMessages() throws Exception
{
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
@@ -535,7 +555,7 @@
assertEquals(1, queueControl.getMessageCount());
// moved all messages to otherQueue
- int movedMessagesCount = queueControl.moveAllMessages(otherQueue.toString());
+ int movedMessagesCount = queueControl.moveMessages(null, otherQueue.toString());
assertEquals(1, movedMessagesCount);
assertEquals(0, queueControl.getMessageCount());
@@ -554,7 +574,7 @@
session.deleteQueue(otherQueue);
}
- public void testMoveAllMessagesToUnknownQueue() throws Exception
+ public void testMoveMessagesToUnknownQueue() throws Exception
{
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
@@ -576,7 +596,7 @@
// moved all messages to unknown queue
try
{
- queueControl.moveAllMessages(unknownQueue.toString());
+ queueControl.moveMessages(null, unknownQueue.toString());
fail("operation must fail if the other queue does not exist");
}
catch (Exception e)
@@ -598,7 +618,7 @@
* </ol>
*/
- public void testMoveMatchingMessages() throws Exception
+ public void testMoveMessagesWithFilter() throws Exception
{
SimpleString key = new SimpleString("key");
long matchingValue = randomLong();
@@ -625,7 +645,7 @@
assertEquals(2, queueControl.getMessageCount());
// moved matching messages to otherQueue
- int movedMatchedMessagesCount = queueControl.moveMatchingMessages(key + " =" + matchingValue,
+ int movedMatchedMessagesCount = queueControl.moveMessages(key + " =" + matchingValue,
otherQueue.toString());
assertEquals(1, movedMatchedMessagesCount);
assertEquals(1, queueControl.getMessageCount());
@@ -671,7 +691,7 @@
assertEquals(0, otherQueueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(2, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -703,7 +723,7 @@
assertEquals(1, queueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -725,47 +745,13 @@
/**
* <ol>
- * <li>send 2 messages to queue</li>
- * <li>remove all messages using management method</li>
- * <li>check there is no message to consume from queue</li>
- * <li>consume the message from otherQueue</li>
- * </ol>
- */
- public void testRemoveAllMessages() throws Exception
- {
- SimpleString address = randomSimpleString();
- SimpleString queue = randomSimpleString();
-
- session.createQueue(address, queue, null, false);
- ClientProducer producer = session.createProducer(address);
-
- // send 2 messages on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
-
- QueueControl queueControl = createManagementControl(address, queue);
- assertEquals(2, queueControl.getMessageCount());
-
- // delete all messages
- int deletedMessagesCount = queueControl.removeAllMessages();
- assertEquals(2, deletedMessagesCount);
- assertEquals(0, queueControl.getMessageCount());
-
- // check there is no message to consume from queue
- consumeMessages(0, session, queue);
-
- session.deleteQueue(queue);
- }
-
- /**
- * <ol>
* <li>send 2 message to queue</li>
* <li>remove messages from queue using management method <em>with filter</em></li>
* <li>check there is only one message to consume from queue</li>
* </ol>
*/
- public void testRemoveMatchingMessages() throws Exception
+ public void testRemoveMessages() throws Exception
{
SimpleString key = new SimpleString("key");
long matchingValue = randomLong();
@@ -789,7 +775,7 @@
assertEquals(2, queueControl.getMessageCount());
// removed matching messages to otherQueue
- int removedMatchedMessagesCount = queueControl.removeMatchingMessages(key + " =" + matchingValue);
+ int removedMatchedMessagesCount = queueControl.removeMessages(key + " =" + matchingValue);
assertEquals(1, removedMatchedMessagesCount);
assertEquals(1, queueControl.getMessageCount());
@@ -809,6 +795,53 @@
session.deleteQueue(queue);
}
+ public void testRemoveMessagesWithNullFilter() throws Exception
+ {
+ SimpleString address = randomSimpleString();
+ SimpleString queue = randomSimpleString();
+
+ session.createQueue(address, queue, null, false);
+ ClientProducer producer = session.createProducer(address);
+
+ // send on queue
+ producer.send(session.createClientMessage(false));
+ producer.send(session.createClientMessage(false));
+
+ QueueControl queueControl = createManagementControl(address, queue);
+ assertEquals(2, queueControl.getMessageCount());
+
+ // removed matching messages to otherQueue
+ int removedMatchedMessagesCount = queueControl.removeMessages(null);
+ assertEquals(2, removedMatchedMessagesCount);
+ assertEquals(0, queueControl.getMessageCount());
+
+ session.deleteQueue(queue);
+ }
+
+ public void testRemoveMessagesWithEmptyFilter() throws Exception
+ {
+ SimpleString address = randomSimpleString();
+ SimpleString queue = randomSimpleString();
+
+ session.createQueue(address, queue, null, false);
+ ClientProducer producer = session.createProducer(address);
+
+ // send on queue
+ producer.send(session.createClientMessage(false));
+ producer.send(session.createClientMessage(false));
+
+ QueueControl queueControl = createManagementControl(address, queue);
+ assertEquals(2, queueControl.getMessageCount());
+
+ // removed matching messages to otherQueue
+ int removedMatchedMessagesCount = queueControl.removeMessages("");
+ assertEquals(2, removedMatchedMessagesCount);
+ assertEquals(0, queueControl.getMessageCount());
+
+ session.deleteQueue(queue);
+ }
+
+
public void testRemoveMessage() throws Exception
{
SimpleString address = randomSimpleString();
@@ -825,7 +858,7 @@
assertEquals(2, queueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(2, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -934,7 +967,7 @@
assertEquals(0, expiryQueueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -972,7 +1005,7 @@
assertEquals(2, queueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(2, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -1013,7 +1046,7 @@
assertEquals(1, queueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
@@ -1046,7 +1079,7 @@
assertEquals(1, queueControl.getMessageCount());
// the message IDs are set on the server
- Map<String, Object>[] messages = queueControl.listAllMessages();
+ Map<String, Object>[] messages = queueControl.listMessages(null);
assertEquals(1, messages.length);
long messageID = (Long)messages[0].get("messageID");
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-06-29 11:58:08 UTC (rev 7493)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-06-29 12:52:23 UTC (rev 7494)
@@ -164,22 +164,6 @@
return (Boolean)proxy.retrieveAttributeValue("temporary");
}
- public Map<String, Object>[] listAllMessages() throws Exception
- {
- Object[] res = (Object[])proxy.invokeOperation("listAllMessages");
- Map<String, Object>[] results = new Map[res.length];
- for (int i = 0; i < res.length; i++)
- {
- results[i] = (Map<String, Object>)res[i];
- }
- return results;
- }
-
- public String listAllMessagesAsJSON() throws Exception
- {
- return (String)proxy.invokeOperation("listAllMessagesAsJSON");
- }
-
public String listMessageCounter() throws Exception
{
return (String)proxy.invokeOperation("listMessageCounter");
@@ -232,31 +216,21 @@
return (String)proxy.invokeOperation("listScheduledMessagesAsJSON");
}
- public int moveAllMessages(String otherQueueName) throws Exception
+ public int moveMessages(String filter, String otherQueueName) throws Exception
{
- return (Integer)proxy.invokeOperation("moveAllMessages", otherQueueName);
+ return (Integer)proxy.invokeOperation("moveMessages", filter, otherQueueName);
}
- public int moveMatchingMessages(String filter, String otherQueueName) throws Exception
- {
- return (Integer)proxy.invokeOperation("moveMatchingMessages", filter, otherQueueName);
- }
-
public boolean moveMessage(long messageID, String otherQueueName) throws Exception
{
return (Boolean)proxy.invokeOperation("moveMessage", messageID, otherQueueName);
}
- public int removeAllMessages() throws Exception
+ public int removeMessages(String filter) throws Exception
{
- return (Integer)proxy.invokeOperation("removeAllMessages");
+ return (Integer)proxy.invokeOperation("removeMessages", filter);
}
- public int removeMatchingMessages(String filter) throws Exception
- {
- return (Integer)proxy.invokeOperation("removeMatchingMessages", filter);
- }
-
public boolean removeMessage(long messageID) throws Exception
{
return (Boolean)proxy.invokeOperation("removeMessage", messageID);
More information about the jboss-cvs-commits
mailing list