Merge bug21263 into default

Author: dpw

src/com/rabbitmq/client/Channel.java

@@ -355,6 +355,27 @@ Queue.DeclareOk queueDeclare(String queue, boolean passive, boolean durable, boo
      */
     Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Purges the contents of the given queue and awaits a completion.
+     * @see com.rabbitmq.client.AMQP.Queue.Purge
+     * @see com.rabbitmq.client.AMQP.Queue.PurgeOk
+     * @param queue the name of the queue
+     * @return a purge-confirm method if the purge was executed succesfully
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.PurgeOk queuePurge(String queue) throws IOException;
+
+    /**
+     * Purges the contents of the given queue.
+     * @see com.rabbitmq.client.AMQP.Queue.Purge
+     * @see com.rabbitmq.client.AMQP.Queue.PurgeOk
+     * @param queue the name of the queue
+     * @param nowait whether to await completion of the purge 
+     * @return a purge-confirm method if the purge was executed succesfully
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.PurgeOk queuePurge(String queue, boolean nowait) throws IOException;
+
     /**
      * Retrieve a message from a queue using {@link com.rabbitmq.client.AMQP.Basic.Get}
      * @see com.rabbitmq.client.AMQP.Basic.Get

src/com/rabbitmq/client/impl/ChannelN.java

@@ -522,6 +522,21 @@ public Queue.UnbindOk queueUnbind(String queue, String exchange, String routingK
                                             arguments)).getMethod();
     }
 
+    /** Public API - {@inheritDoc} */
+    public Queue.PurgeOk queuePurge(String queue)
+        throws IOException
+    {
+        return queuePurge(queue, false);
+    }
+
+    /** Public API - {@inheritDoc} */
+    public Queue.PurgeOk queuePurge(String queue, boolean nowait)
+        throws IOException
+    {
+        return (Queue.PurgeOk)
+            exnWrappingRpc(new Queue.Purge(TICKET, queue, nowait)).getMethod();
+    }
+
     /** Public API - {@inheritDoc} */
     public Queue.UnbindOk queueUnbind(String queue, String exchange, String routingKey)
         throws IOException

test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java

@@ -211,6 +211,23 @@ public void testQueueDelete() throws IOException {
         deleteExchangeAndQueue(binding);
     }
 
+    /**
+     * This tests that when you purge a queue, all of its messages go.
+     */
+    public void testQueuePurge() throws IOException {
+
+        Binding binding = setupExchangeBindings(false);
+        channel.basicPublish(binding.x, binding.k, null, payload);
+
+        // Purge the queue, and test that we don't recieve a message
+        channel.queuePurge(binding.q);
+
+        GetResponse response = channel.basicGet(binding.q, true);
+        assertNull("The response SHOULD BE null", response);
+
+        deleteExchangeAndQueue(binding);
+    }
+
     /**
      * This tests whether when you delete an exchange, that any
      * bindings attached to it are deleted as well.