NO-JIRA: Remove old management methods from SimpleAMQQueue

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-config-and-management@1355023 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1 insertions, 321 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index 38847972d5..d3efd63ee0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -160,13 +160,6 @@ public interface AMQQueue extends Comparable<AMQQueue>, ExchangeReferrer, Transa
      */
     public List<QueueEntry> getMessagesRangeOnTheQueue(final long fromPosition, final long toPosition);
 
-
-    void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName);
-
-    void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName);
-
-    void removeMessagesFromQueue(long fromMessageId, long toMessageId);
-
     void visit(QueueEntryVisitor visitor);
 
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 4e609af254..3d54bba48f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -1227,192 +1227,6 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
 
     }
 
-    public void moveMessagesToAnotherQueue(final long fromMessageId,
-                                           final long toMessageId,
-                                           String destinationQueueName) throws IllegalArgumentException
-    {
-
-        final AMQQueue toQueue = getValidatedDestinationQueue(destinationQueueName);
-
-        List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
-        {
-
-            public boolean accept(QueueEntry entry)
-            {
-                final long messageId = entry.getMessage().getMessageNumber();
-                return (messageId >= fromMessageId)
-                       && (messageId <= toMessageId)
-                       && entry.acquire();
-            }
-
-            public boolean filterComplete()
-            {
-                return false;
-            }
-        });
-
-
-        final ServerTransaction txn = new LocalTransaction(getVirtualHost().getMessageStore());
-        boolean shouldRollback = true;
-        try
-        {
-            // Move the messages in on the message store.
-            for (final QueueEntry entry : entries)
-            {
-                final ServerMessage message = entry.getMessage();
-                txn.enqueue(toQueue, message,
-                            new ServerTransaction.Action()
-                            {
-
-                                public void postCommit()
-                                {
-                                    try
-                                    {
-                                        toQueue.enqueue(message);
-                                    }
-                                    catch (AMQException e)
-                                    {
-                                        throw new RuntimeException(e);
-                                    }
-                                }
-
-                                public void onRollback()
-                                {
-                                    entry.release();
-                                }
-                            });
-                txn.dequeue(this, message,
-                            new ServerTransaction.Action()
-                            {
-
-                                public void postCommit()
-                                {
-                                    entry.discard();
-                                }
-
-                                public void onRollback()
-                                {
-
-                                }
-                            });
-            }
-            txn.commit();
-            shouldRollback = false;
-        }
-        finally
-        {
-            if (shouldRollback)
-            {
-                txn.rollback();
-            }
-        }
-
-    }
-
-    public void copyMessagesToAnotherQueue(final long fromMessageId,
-                                           final long toMessageId,
-                                           String destinationQueueName) throws IllegalArgumentException
-    {
-        final AMQQueue toQueue = getValidatedDestinationQueue(destinationQueueName);
-
-        List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
-        {
-
-            public boolean accept(QueueEntry entry)
-            {
-                final long messageId = entry.getMessage().getMessageNumber();
-                return ((messageId >= fromMessageId)
-                    && (messageId <= toMessageId));
-            }
-
-            public boolean filterComplete()
-            {
-                return false;
-            }
-        });
-
-        final ServerTransaction txn = new LocalTransaction(_virtualHost.getMessageStore());
-        boolean shouldRollback = true;
-        try
-        {
-            // Copy the messages in on the message store.
-            for (QueueEntry entry : entries)
-            {
-                final ServerMessage message = entry.getMessage();
-
-                txn.enqueue(toQueue, message, new ServerTransaction.Action()
-                {
-                    public void postCommit()
-                    {
-                        try
-                        {
-                            toQueue.enqueue(message);
-                        }
-                        catch (AMQException e)
-                        {
-                            throw new RuntimeException(e);
-                        }
-                    }
-
-                    public void onRollback()
-                    {
-                    }
-                });
-
-            }
-
-            txn.commit();
-            shouldRollback = false;
-        }
-        finally
-        {
-            if (shouldRollback)
-            {
-                txn.rollback();
-            }
-        }
-
-    }
-
-    private AMQQueue getValidatedDestinationQueue(String queueName)
-    {
-        final AMQQueue toQueue = getVirtualHost().getQueueRegistry().getQueue(new AMQShortString(queueName));
-        if (toQueue == null)
-        {
-            throw new IllegalArgumentException("Queue '" + queueName + "' is not registered with the virtualhost.");
-        }
-        else if (toQueue == this)
-        {
-            throw new IllegalArgumentException("The destination queue can't be the same as the source queue");
-        }
-        return toQueue;
-    }
-
-    public void removeMessagesFromQueue(long fromMessageId, long toMessageId)
-    {
-
-        QueueEntryIterator queueListIterator = _entries.iterator();
-
-        while (queueListIterator.advance())
-        {
-            QueueEntry node = queueListIterator.getNode();
-
-            final ServerMessage message = node.getMessage();
-            if(message != null)
-            {
-                final long messageId = message.getMessageNumber();
-
-                if ((messageId >= fromMessageId)
-                    && (messageId <= toMessageId)
-                    && node.acquire())
-                {
-                    dequeueEntry(node);
-                }
-            }
-        }
-
-    }
-
     public void purge(final long request) throws AMQException
     {
         clear(request);
@@ -1425,6 +1239,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
 
     // ------ Management functions
 
+    // TODO - now only used by the tests
     public void deleteMessageFromTop()
     {
         QueueEntryIterator queueListIterator = _entries.iterator();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index c1c200c43e..d3eb61a544 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -386,21 +386,6 @@ public class MockAMQQueue implements AMQQueue
         return null;
     }
 
-    public void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
-    {
-
-    }
-
-    public void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName)
-    {
-
-    }
-
-    public void removeMessagesFromQueue(long fromMessageId, long toMessageId)
-    {
-
-    }
-
     public long getMaximumMessageSize()
     {
         return 0;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 3048ca3803..d2fe529856 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -845,120 +845,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         }
     }
 
-    /**
-     * Tests that dequeued message is not copied as part of invocation of
-     * {@link SimpleAMQQueue#copyMessagesToAnotherQueue(long, long, String)}
-     */
-    public void testCopyMessagesWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-        String anotherQueueName = "testQueue2";
-
-        // put test messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // create another queue
-        SimpleAMQQueue queue = createQueue(anotherQueueName);
 
-        // copy messages into another queue
-        _queue.copyMessagesToAnotherQueue(0, messageNumber, anotherQueueName);
-
-        // get messages on another queue
-        List<QueueEntry> entries = queue.getMessagesOnTheQueue();
-
-        // assert another queue entries
-        assertEquals(messageNumber - 1, entries.size());
-        int expectedId = 0;
-        for (int i = 0; i < messageNumber - 1; i++)
-        {
-            Long id = ((AMQMessage)entries.get(i).getMessage()).getMessageId();
-            if (i == dequeueMessageIndex)
-            {
-                assertFalse("Message with id " + dequeueMessageIndex
-                        + " was dequeued and should not been copied into another queue!",
-                        new Long(expectedId).equals(id));
-                expectedId++;
-            }
-            assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
-                    new Long(expectedId), id);
-            expectedId++;
-        }
-    }
-
-    /**
-     * Tests that dequeued message is not moved as part of invocation of
-     * {@link SimpleAMQQueue#moveMessagesToAnotherQueue(long, long, String)}
-     */
-    public void testMovedMessagesWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-        String anotherQueueName = "testQueue2";
-
-        // put messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // create another queue
-        SimpleAMQQueue queue = createQueue(anotherQueueName);
-
-        // move messages into another queue
-        _queue.moveMessagesToAnotherQueue(0, messageNumber, anotherQueueName);
-
-        // get messages on another queue
-        List<QueueEntry> entries = queue.getMessagesOnTheQueue();
-
-        // assert another queue entries
-        assertEquals(messageNumber - 1, entries.size());
-        int expectedId = 0;
-        for (int i = 0; i < messageNumber - 1; i++)
-        {
-            Long id = ((AMQMessage)entries.get(i).getMessage()).getMessageId();
-            if (i == dequeueMessageIndex)
-            {
-                assertFalse("Message with id " + dequeueMessageIndex
-                        + " was dequeued and should not been copied into another queue!",
-                        new Long(expectedId).equals(id));
-                expectedId++;
-            }
-            assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
-                    new Long(expectedId), id);
-            expectedId++;
-        }
-    }
-
-    /**
-     * Tests that messages in given range including dequeued one are deleted
-     * from the queue on invocation of
-     * {@link SimpleAMQQueue#removeMessagesFromQueue(long, long)}
-     */
-    public void testRemoveMessagesFromQueueWithDequeuedEntry()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 1;
-
-        // put messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        // remove messages
-        _queue.removeMessagesFromQueue(0, messageNumber);
-
-        // get queue entries
-        List<QueueEntry> entries = _queue.getMessagesOnTheQueue();
-
-        // assert queue entries
-        assertNotNull("Null is returned from getMessagesOnTheQueue", entries);
-        assertEquals("Queue should be empty", 0, entries.size());
-    }
 
     /**
      * Tests that dequeued message on the top is not accounted and next message