QPID-5559 : [Java Broker] remove unused methods from AMQQueue interface

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1569119 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 14 insertions, 102 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
index 33c8e26790..07f7660f62 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
@@ -45,8 +45,6 @@ public interface MessageSource<C extends Consumer, S extends MessageSource<C,S>>
 
     void removeConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
 
-    boolean isExclusive();
-
     boolean verifySessionAccess(AMQSessionModel<?,?> session);
 
     interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,?>>
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index aceebc722b..a5ab77283f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -52,9 +52,7 @@ public interface AMQQueue<E extends QueueEntry<E,Q,C>, Q extends AMQQueue<E,Q,C>
         void notifyClients(NotificationCheck notification, AMQQueue queue, String notificationMsg);
     }
 
-    boolean getDeleteOnNoConsumers();
-
-    void setDeleteOnNoConsumers(boolean b);
+    boolean isExclusive();
 
     void addBinding(Binding binding);
 
@@ -166,8 +164,6 @@ public interface AMQQueue<E extends QueueEntry<E,Q,C>, Q extends AMQQueue<E,Q,C>
 
     boolean isOverfull();
 
-    void deleteMessageFromTop();
-
     long clearQueue() throws QpidSecurityException;
 
     /**
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index aa7025e068..e7e45db58b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -170,7 +170,6 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
     private boolean _noLocal;
 
     private final AtomicBoolean _overfull = new AtomicBoolean(false);
-    private boolean _deleteOnNoConsumers;
     private final CopyOnWriteArrayList<Binding> _bindings = new CopyOnWriteArrayList<Binding>();
     private UUID _id;
     private final Map<String, Object> _arguments;
@@ -846,16 +845,6 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
         }
     }
 
-    public boolean getDeleteOnNoConsumers()
-    {
-        return _deleteOnNoConsumers;
-    }
-
-    public void setDeleteOnNoConsumers(boolean b)
-    {
-        _deleteOnNoConsumers = b;
-    }
-
     public void addBinding(final Binding binding)
     {
         _bindings.add(binding);
@@ -1458,24 +1447,6 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
 
     // ------ Management functions
 
-    // TODO - now only used by the tests
-    public void deleteMessageFromTop()
-    {
-        QueueEntryIterator<E,Q,L,QueueConsumer<?,E,Q,L>> queueListIterator = _entries.iterator();
-        boolean noDeletes = true;
-
-        while (noDeletes && queueListIterator.advance())
-        {
-            E node = queueListIterator.getNode();
-            if (node.acquire())
-            {
-                dequeueEntry(node);
-                noDeletes = false;
-            }
-
-        }
-    }
-
     public long clearQueue() throws QpidSecurityException
     {
         return clear(0l);
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index e8a2223b15..0af6ba125b 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -107,7 +107,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         int queueCount = routeMessage("a.c",1l);
@@ -129,7 +129,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
 
@@ -139,7 +139,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         int queueCount = routeMessage("a",2l);
@@ -160,7 +160,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         routeMessage("a.b",1l);
@@ -169,7 +169,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
 
@@ -179,7 +179,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 2l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         routeMessage("a",3l);
@@ -188,7 +188,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
 
@@ -210,7 +210,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         routeMessage("a.c.b",1l);
@@ -219,7 +219,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
     }
@@ -242,7 +242,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
         queueCount = routeMessage("a.b.c.b",2l);
@@ -256,7 +256,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
     }
@@ -278,7 +278,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
     }
@@ -299,7 +299,7 @@ public class TopicExchangeTest extends QpidTestCase
 
         Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
 
-        queue.deleteMessageFromTop();
+        queue.clearQueue();
         Assert.assertEquals(0, queue.getMessageCount());
 
     }
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 435dff6cf5..934d60a23f 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -70,15 +70,6 @@ public class MockAMQQueue implements AMQQueue
 
     }
 
-    public boolean getDeleteOnNoConsumers()
-    {
-        return false;
-    }
-
-    public void setDeleteOnNoConsumers(boolean b)
-    {
-    }
-
     public void addBinding(final Binding binding)
     {
         _bindings.add(binding);
@@ -448,11 +439,6 @@ public class MockAMQQueue implements AMQQueue
         return 0;
     }
 
-    public void deleteMessageFromTop()
-    {
-
-    }
-
     public long clearQueue()
     {
         return 0;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
index 956a9fc424..1c88df611a 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
@@ -795,38 +795,6 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
         }
     }
 
-
-
-    /**
-     * Tests that dequeued message on the top is not accounted and next message
-     * is deleted from the queue on invocation of
-     * {@link SimpleAMQQueue#deleteMessageFromTop()}
-     */
-    public void testDeleteMessageFromTopWithDequeuedEntryOnTop()
-    {
-        int messageNumber = 4;
-        int dequeueMessageIndex = 0;
-
-        // put messages into a test queue
-        enqueueGivenNumberOfMessages(_queue, messageNumber);
-
-        // dequeue message on top
-        dequeueMessage(_queue, dequeueMessageIndex);
-
-        //delete message from top
-        _queue.deleteMessageFromTop();
-
-        //get queue entries
-        List<E> entries = _queue.getMessagesOnTheQueue();
-
-        // assert queue entries
-        assertNotNull("Null is returned from getMessagesOnTheQueue", entries);
-        assertEquals("Expected " + (messageNumber - 2) + " number of messages  but recieved " + entries.size(),
-                     messageNumber - 2, entries.size());
-        assertEquals("Expected first entry with id 2", 2l,
-                (entries.get(0).getMessage()).getMessageNumber());
-    }
-
     /**
      * Tests that all messages including dequeued one are deleted from the queue
      * on invocation of {@link SimpleAMQQueue#clearQueue()}
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 77886fa15e..15e0303e61 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -73,7 +73,6 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
         final StandardQueue queue = new StandardQueue(getVirtualHost(), null, queueAttributes);
 
         setQueue(queue);
-        getQueue().setDeleteOnNoConsumers(true);
 
         ServerMessage message = createMessage(25l);
         QueueConsumer consumer =
diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 200da28e1c..6f083012e7 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -981,12 +981,6 @@ class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementN
     }
 
     @Override
-    public boolean isExclusive()
-    {
-        return false;
-    }
-
-    @Override
     public boolean verifySessionAccess(final AMQSessionModel<?, ?> session)
     {
         return true;