merge bug19250 into default

Author: tonyg

src/com/rabbitmq/client/Channel.java

@@ -305,6 +305,19 @@ Queue.DeclareOk queueDeclare(int ticket, String queue, boolean passive, boolean
      */
     Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey) throws IOException;
 
+    /**
+     * Uninds a queue from an exchange, with no extra arguments.
+     * @see com.rabbitmq.client.AMQP.Queue.Unbind
+     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
+     * @param ticket an access ticket for the appropriate realm
+     * @param queue the name of the queue
+     * @param exchange the name of the exchange
+     * @param routingKey the routine key to use for the binding
+     * @return an unbinding-confirm method if the binding was successfully deleted
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey) throws IOException;
+
     /**
      * Bind a queue to an exchange.
      * @see com.rabbitmq.client.AMQP.Queue.Bind
@@ -319,6 +332,20 @@ Queue.DeclareOk queueDeclare(int ticket, String queue, boolean passive, boolean
      */
     Queue.BindOk queueBind(int ticket, String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
 
+    /**
+     * Unbind a queue from an exchange.
+     * @see com.rabbitmq.client.AMQP.Queue.Unbind
+     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
+     * @param ticket an access ticket for the appropriate realm
+     * @param queue the name of the queue
+     * @param exchange the name of the exchange
+     * @param routingKey the routine key to use for the binding
+     * @param arguments other properties (binding parameters)
+     * @return an unbinding-confirm method if the binding was successfully deleted
+     * @throws java.io.IOException if an error is encountered
+     */
+    Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey, Map<String, Object> arguments) 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

@@ -535,6 +535,20 @@ public Queue.BindOk queueBind(int ticket, String queue, String exchange,
                                           false, arguments)).getMethod();
     }
 
+    /**
+     * Public API - Unbind a queue from an exchange.
+     * @see com.rabbitmq.client.AMQP.Queue.Unbind
+     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
+     */
+    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange,
+                                  String routingKey, Map<String, Object> arguments)
+        throws IOException
+    {
+        return (Queue.UnbindOk)
+            exnWrappingRpc(new Queue.Unbind(ticket, queue, exchange, routingKey,
+                                          arguments)).getMethod();
+    }
+
     /**
      * Public API - Bind a queue to an exchange, with no extra arguments.
      * @see com.rabbitmq.client.AMQP.Queue.Bind
@@ -546,6 +560,17 @@ public Queue.BindOk queueBind(int ticket, String queue, String exchange, String
         return queueBind(ticket, queue, exchange, routingKey, null);
     }
 
+    /**
+     * Public API - Unbind a queue from an exchange, with no extra arguments.
+     * @see com.rabbitmq.client.AMQP.Queue.Unbind
+     * @see com.rabbitmq.client.AMQP.Queue.UnbindOk
+     */
+    public Queue.UnbindOk queueUnbind(int ticket, String queue, String exchange, String routingKey)
+        throws IOException
+    {
+        return queueUnbind(ticket, queue, exchange, routingKey, null);
+    }
+
     /**
      * Public API - Retrieve a message from a queue using {@link com.rabbitmq.client.AMQP.Basic.Get}
      * @see com.rabbitmq.client.AMQP.Basic.Get

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

@@ -25,10 +25,11 @@
 
 package com.rabbitmq.client.test.functional;
 
-import java.io.IOException;
-
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.GetResponse;
 
+import java.io.IOException;
+
 public class Routing extends BrokerTestCase
 {
 
@@ -119,4 +120,23 @@ public void testDoubleBinding()
         checkGet(Q1, true);
         checkGet(Q1, false);
     }
+
+    public void testUnbind() throws Exception {
+        AMQP.Queue.DeclareOk ok = channel.queueDeclare(ticket);
+        String queue = ok.getQueue();
+
+        String routingKey = "quay";
+        String x = "amq.direct";
+
+        channel.queueBind(ticket, queue, x, routingKey);
+        channel.basicPublish(ticket, x, routingKey, null, "foobar".getBytes());
+        checkGet(queue, true);
+
+        channel.queueUnbind(ticket, queue, x, routingKey);
+
+        channel.basicPublish(ticket, x, routingKey, null, "foobar".getBytes());
+        checkGet(queue, false);
+
+        channel.queueDelete(ticket, queue);
+    }
 }