[jboss-cvs] JBoss Messaging SVN: r4788 - in trunk: src/main/org/jboss/messaging/core/management/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 8 08:35:51 EDT 2008
Author: jmesnil
Date: 2008-08-08 08:35:50 -0400 (Fri, 08 Aug 2008)
New Revision: 4788
Modified:
trunk/src/main/org/jboss/messaging/core/management/MessagingServerManagement.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerManagementImplTest.java
Log:
renamed MessagingServerManagement methods to distinguish between a queueName and an address
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerManagement.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerManagement.java 2008-08-08 09:11:24 UTC (rev 4787)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerManagement.java 2008-08-08 12:35:50 UTC (rev 4788)
@@ -99,13 +99,7 @@
*/
List<Queue> getQueuesForAddress(SimpleString address) throws Exception;
- /**
- * @param messageID
- * @param simpleAddress
- * @return
- * @throws Exception
- */
- boolean removeMessageFromAddress(long messageID, SimpleString address) throws Exception;
+ boolean removeMessageFromQueue(long messageID, SimpleString queueName) throws Exception;
/**
* remove all the messages for a specific address
@@ -136,22 +130,11 @@
*/
String getVersion();
- /**
- * @param messageID
- * @param address
- * @return
- * @throws Exception
- */
- boolean expireMessage(long messageID, SimpleString address) throws Exception;
+ boolean expireMessage(long messageID, SimpleString queueName) throws Exception;
- /**
- * @param filter
- * @param address
- * @return
- * @throws Exception
- */
+
int expireMessages(Filter filter,
- SimpleString address) throws Exception;
+ SimpleString queueName) throws Exception;
/**
* @param simpleAddress
@@ -159,20 +142,9 @@
*/
QueueSettings getQueueSettings(SimpleString simpleAddress);
- /**
- * @param filter
- * @param simpleAddress
- * @return
- */
int sendMessagesToDLQ(Filter filter,
- SimpleString simpleAddress) throws Exception;
+ SimpleString queueName) throws Exception;
- /**
- * @param filter
- * @param newPriority
- * @param simpleAddress
- * @return
- */
int changeMessagesPriority(Filter filter,
- byte newPriority, SimpleString address) throws Exception;
+ byte newPriority, SimpleString queueName) throws Exception;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-08-08 09:11:24 UTC (rev 4787)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-08-08 12:35:50 UTC (rev 4788)
@@ -129,9 +129,9 @@
return server.getConnectionCount();
}
- public void destroyQueue(final SimpleString name) throws Exception
+ public void destroyQueue(final SimpleString queueName) throws Exception
{
- Binding binding = postOffice.getBinding(name);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
@@ -167,10 +167,10 @@
}
}
- public boolean removeMessageFromAddress(final long messageID,
- SimpleString address) throws Exception
+ public boolean removeMessageFromQueue(final long messageID,
+ SimpleString queueName) throws Exception
{
- Binding binding = postOffice.getBinding(address);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
Queue queue = binding.getQueue();
@@ -179,10 +179,10 @@
return false;
}
- public boolean expireMessage(final long messageID, final SimpleString address)
+ public boolean expireMessage(final long messageID, final SimpleString queueName)
throws Exception
{
- Binding binding = postOffice.getBinding(address);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
Queue queue = binding.getQueue();
@@ -193,9 +193,9 @@
}
public int expireMessages(final Filter filter,
- final SimpleString address) throws Exception
+ final SimpleString queueName) throws Exception
{
- Binding binding = postOffice.getBinding(address);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
Queue queue = binding.getQueue();
@@ -211,9 +211,9 @@
}
public int sendMessagesToDLQ(final Filter filter,
- final SimpleString address) throws Exception
+ final SimpleString queueName) throws Exception
{
- Binding binding = postOffice.getBinding(address);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
Queue queue = binding.getQueue();
@@ -229,9 +229,9 @@
}
public int changeMessagesPriority(final Filter filter,
- final byte newPriority, final SimpleString address) throws Exception
+ final byte newPriority, final SimpleString queueName) throws Exception
{
- Binding binding = postOffice.getBinding(address);
+ Binding binding = postOffice.getBinding(queueName);
if (binding != null)
{
Queue queue = binding.getQueue();
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-08-08 09:11:24 UTC (rev 4787)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-08-08 12:35:50 UTC (rev 4788)
@@ -281,7 +281,7 @@
public boolean removeMessage(final long messageID,
final JBossDestination destination) throws Exception
{
- return messagingServerManagement.removeMessageFromAddress(messageID,
+ return messagingServerManagement.removeMessageFromQueue(messageID,
destination.getSimpleAddress());
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerManagementImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerManagementImplTest.java 2008-08-08 09:11:24 UTC (rev 4787)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerManagementImplTest.java 2008-08-08 12:35:50 UTC (rev 4788)
@@ -313,15 +313,15 @@
}
- public void testRemoveMessageForAddress() throws Exception
+ public void testRemoveMessageFromQueue() throws Exception
{
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(binding);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(binding);
expect(binding.getQueue()).andReturn(queue);
expect(queue.deleteReference(messageID, mockStorageManager)).andReturn(
true);
@@ -329,7 +329,7 @@
replay(mockPostOffice, binding, queue, mockStorageManager);
MessagingServerManagementImpl impl = createImpl();
- assertTrue(impl.removeMessageFromAddress(messageID, address));
+ assertTrue(impl.removeMessageFromQueue(messageID, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager);
}
@@ -345,20 +345,20 @@
replay(mockPostOffice);
MessagingServerManagementImpl impl = createImpl();
- assertFalse(impl.removeMessageFromAddress(messageID, address));
+ assertFalse(impl.removeMessageFromQueue(messageID, address));
verify(mockPostOffice);
}
public void testExpireMessage() throws Exception
{
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(binding);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(binding);
expect(binding.getQueue()).andReturn(queue);
expect(
queue.expireMessage(messageID, mockStorageManager, mockPostOffice,
@@ -367,23 +367,23 @@
replay(mockPostOffice, binding, queue, mockStorageManager);
MessagingServerManagementImpl impl = createImpl();
- assertTrue(impl.expireMessage(messageID, address));
+ assertTrue(impl.expireMessage(messageID, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager);
}
- public void testExpireMessageForUnkownAddress() throws Exception
+ public void testExpireMessageForUnkownQueueName() throws Exception
{
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
mockPostOffice = createMock(PostOffice.class);
- expect(mockPostOffice.getBinding(address)).andReturn(null);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(null);
replay(mockPostOffice);
MessagingServerManagementImpl impl = createImpl();
- assertFalse(impl.expireMessage(messageID, address));
+ assertFalse(impl.expireMessage(messageID, queueName));
verify(mockPostOffice);
}
@@ -391,13 +391,13 @@
public void testExpireMessages() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(binding);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(binding);
expect(binding.getQueue()).andReturn(queue);
List<MessageReference> refs = new ArrayList<MessageReference>();
MessageReference ref = createMock(MessageReference.class);
@@ -413,25 +413,25 @@
replay(mockPostOffice, binding, queue, mockStorageManager, ref, message);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(1, impl.expireMessages(filter, address));
+ assertEquals(1, impl.expireMessages(filter, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager, ref, message);
}
- public void testExpireMessagesForUnknownAddress() throws Exception
+ public void testExpireMessagesForUnknownQueueName() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(null);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(null);
replay(mockPostOffice, binding, queue, mockStorageManager);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(0, impl.expireMessages(filter, address));
+ assertEquals(0, impl.expireMessages(filter, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager);
}
@@ -439,13 +439,13 @@
public void testSendMessagesToDLQ() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(binding);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(binding);
expect(binding.getQueue()).andReturn(queue);
List<MessageReference> refs = new ArrayList<MessageReference>();
MessageReference ref = createMock(MessageReference.class);
@@ -461,23 +461,23 @@
replay(mockPostOffice, binding, queue, mockStorageManager, ref, message);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(1, impl.sendMessagesToDLQ(filter, address));
+ assertEquals(1, impl.sendMessagesToDLQ(filter, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager, ref, message);
}
- public void testSendMessagesToDLQForUnknownAddress() throws Exception
+ public void testSendMessagesToDLQForUnknownQueueName() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
mockPostOffice = createMock(PostOffice.class);
- expect(mockPostOffice.getBinding(address)).andReturn(null);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(null);
replay(mockPostOffice);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(0, impl.sendMessagesToDLQ(filter, address));
+ assertEquals(0, impl.sendMessagesToDLQ(filter, queueName));
verify(mockPostOffice);
}
@@ -485,14 +485,14 @@
public void testChangeMessagesPriority() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
long messageID = randomLong();
byte newPriority = (byte) 9;
mockPostOffice = createMock(PostOffice.class);
Binding binding = createMock(Binding.class);
Queue queue = createMock(Queue.class);
- expect(mockPostOffice.getBinding(address)).andReturn(binding);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(binding);
expect(binding.getQueue()).andReturn(queue);
List<MessageReference> refs = new ArrayList<MessageReference>();
MessageReference ref = createMock(MessageReference.class);
@@ -509,24 +509,24 @@
replay(mockPostOffice, binding, queue, mockStorageManager, ref, message);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(1, impl.changeMessagesPriority(filter, newPriority, address));
+ assertEquals(1, impl.changeMessagesPriority(filter, newPriority, queueName));
verify(mockPostOffice, binding, queue, mockStorageManager, ref, message);
}
- public void testChangeMessagesPriorityForUnknownAddress() throws Exception
+ public void testChangeMessagesPriorityForUnknownQueueName() throws Exception
{
Filter filter = new FilterImpl(new SimpleString("color = 'green'"));
- SimpleString address = randomSimpleString();
+ SimpleString queueName = randomSimpleString();
byte newPriority = (byte) 9;
mockPostOffice = createMock(PostOffice.class);
- expect(mockPostOffice.getBinding(address)).andReturn(null);
+ expect(mockPostOffice.getBinding(queueName)).andReturn(null);
replay(mockPostOffice);
MessagingServerManagementImpl impl = createImpl();
- assertEquals(0, impl.changeMessagesPriority(filter, newPriority, address));
+ assertEquals(0, impl.changeMessagesPriority(filter, newPriority, queueName));
verify(mockPostOffice);
}
More information about the jboss-cvs-commits
mailing list