Merge bug 23170 into default (remove queuePurge(String, boolean))

Author: Simon MacMullen

src/com/rabbitmq/client/Channel.java

@@ -412,26 +412,15 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
      */
     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;
+    Queue.PurgeOk queuePurge(String queue) throws IOException;
 
     /**
      * Retrieve a message from a queue using {@link com.rabbitmq.client.AMQP.Basic.Get}

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

@@ -596,16 +596,9 @@ public Queue.UnbindOk queueUnbind(String queue, String exchange, String routingK
     /** 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();
+            exnWrappingRpc(new Queue.Purge(TICKET, queue, false)).getMethod();
     }
 
     /** Public API - {@inheritDoc} */